diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java index 992714e4bb..4f8b153138 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -174,8 +174,8 @@ public final class ItemInstance extends WorldObject private final DropProtection _dropProtection = new DropProtection(); private final List _enchantOptions = new ArrayList<>(); - private final EnsoulOption[] _ensoulOptions = new EnsoulOption[3]; - private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[3]; + private final EnsoulOption[] _ensoulOptions = new EnsoulOption[2]; + private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[1]; /** * Constructor of the ItemInstance from the objectId and the itemId. @@ -2171,7 +2171,11 @@ public final class ItemInstance extends WorldObject public void addSpecialAbility(EnsoulOption option, int position, int type, boolean updateInDB) { - if ((position < 0) || (position > 2)) + if ((type == 1) && ((position < 0) || (position > 1))) // two first slots + { + return; + } + if ((type == 2) && (position != 0)) // third slot { return; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java index 992714e4bb..4f8b153138 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -174,8 +174,8 @@ public final class ItemInstance extends WorldObject private final DropProtection _dropProtection = new DropProtection(); private final List _enchantOptions = new ArrayList<>(); - private final EnsoulOption[] _ensoulOptions = new EnsoulOption[3]; - private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[3]; + private final EnsoulOption[] _ensoulOptions = new EnsoulOption[2]; + private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[1]; /** * Constructor of the ItemInstance from the objectId and the itemId. @@ -2171,7 +2171,11 @@ public final class ItemInstance extends WorldObject public void addSpecialAbility(EnsoulOption option, int position, int type, boolean updateInDB) { - if ((position < 0) || (position > 2)) + if ((type == 1) && ((position < 0) || (position > 1))) // two first slots + { + return; + } + if ((type == 2) && (position != 0)) // third slot { return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java index 50cdf83fbe..bf7fba78dd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -174,8 +174,8 @@ public final class ItemInstance extends WorldObject private final DropProtection _dropProtection = new DropProtection(); private final List _enchantOptions = new ArrayList<>(); - private final EnsoulOption[] _ensoulOptions = new EnsoulOption[3]; - private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[3]; + private final EnsoulOption[] _ensoulOptions = new EnsoulOption[2]; + private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[1]; /** * Constructor of the ItemInstance from the objectId and the itemId. @@ -2171,7 +2171,11 @@ public final class ItemInstance extends WorldObject public void addSpecialAbility(EnsoulOption option, int position, int type, boolean updateInDB) { - if ((position < 0) || (position > 2)) + if ((type == 1) && ((position < 0) || (position > 1))) // two first slots + { + return; + } + if ((type == 2) && (position != 0)) // third slot { return; } diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java index 50cdf83fbe..bf7fba78dd 100644 --- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -174,8 +174,8 @@ public final class ItemInstance extends WorldObject private final DropProtection _dropProtection = new DropProtection(); private final List _enchantOptions = new ArrayList<>(); - private final EnsoulOption[] _ensoulOptions = new EnsoulOption[3]; - private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[3]; + private final EnsoulOption[] _ensoulOptions = new EnsoulOption[2]; + private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[1]; /** * Constructor of the ItemInstance from the objectId and the itemId. @@ -2171,7 +2171,11 @@ public final class ItemInstance extends WorldObject public void addSpecialAbility(EnsoulOption option, int position, int type, boolean updateInDB) { - if ((position < 0) || (position > 2)) + if ((type == 1) && ((position < 0) || (position > 1))) // two first slots + { + return; + } + if ((type == 2) && (position != 0)) // third slot { return; } diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java index 50cdf83fbe..bf7fba78dd 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -174,8 +174,8 @@ public final class ItemInstance extends WorldObject private final DropProtection _dropProtection = new DropProtection(); private final List _enchantOptions = new ArrayList<>(); - private final EnsoulOption[] _ensoulOptions = new EnsoulOption[3]; - private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[3]; + private final EnsoulOption[] _ensoulOptions = new EnsoulOption[2]; + private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[1]; /** * Constructor of the ItemInstance from the objectId and the itemId. @@ -2171,7 +2171,11 @@ public final class ItemInstance extends WorldObject public void addSpecialAbility(EnsoulOption option, int position, int type, boolean updateInDB) { - if ((position < 0) || (position > 2)) + if ((type == 1) && ((position < 0) || (position > 1))) // two first slots + { + return; + } + if ((type == 2) && (position != 0)) // third slot { return; } diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java index 50cdf83fbe..bf7fba78dd 100644 --- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -174,8 +174,8 @@ public final class ItemInstance extends WorldObject private final DropProtection _dropProtection = new DropProtection(); private final List _enchantOptions = new ArrayList<>(); - private final EnsoulOption[] _ensoulOptions = new EnsoulOption[3]; - private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[3]; + private final EnsoulOption[] _ensoulOptions = new EnsoulOption[2]; + private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[1]; /** * Constructor of the ItemInstance from the objectId and the itemId. @@ -2171,7 +2171,11 @@ public final class ItemInstance extends WorldObject public void addSpecialAbility(EnsoulOption option, int position, int type, boolean updateInDB) { - if ((position < 0) || (position > 2)) + if ((type == 1) && ((position < 0) || (position > 1))) // two first slots + { + return; + } + if ((type == 2) && (position != 0)) // third slot { return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java index 2684f5c240..5d85fa47e2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -174,8 +174,8 @@ public final class ItemInstance extends WorldObject private final DropProtection _dropProtection = new DropProtection(); private final List _enchantOptions = new ArrayList<>(); - private final EnsoulOption[] _ensoulOptions = new EnsoulOption[3]; - private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[3]; + private final EnsoulOption[] _ensoulOptions = new EnsoulOption[2]; + private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[1]; /** * Constructor of the ItemInstance from the objectId and the itemId. @@ -2169,7 +2169,11 @@ public final class ItemInstance extends WorldObject public void addSpecialAbility(EnsoulOption option, int position, int type, boolean updateInDB) { - if ((position < 0) || (position > 2)) + if ((type == 1) && ((position < 0) || (position > 1))) // two first slots + { + return; + } + if ((type == 2) && (position != 0)) // third slot { return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java index 2684f5c240..5d85fa47e2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -174,8 +174,8 @@ public final class ItemInstance extends WorldObject private final DropProtection _dropProtection = new DropProtection(); private final List _enchantOptions = new ArrayList<>(); - private final EnsoulOption[] _ensoulOptions = new EnsoulOption[3]; - private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[3]; + private final EnsoulOption[] _ensoulOptions = new EnsoulOption[2]; + private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[1]; /** * Constructor of the ItemInstance from the objectId and the itemId. @@ -2169,7 +2169,11 @@ public final class ItemInstance extends WorldObject public void addSpecialAbility(EnsoulOption option, int position, int type, boolean updateInDB) { - if ((position < 0) || (position > 2)) + if ((type == 1) && ((position < 0) || (position > 1))) // two first slots + { + return; + } + if ((type == 2) && (position != 0)) // third slot { return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java index 2684f5c240..5d85fa47e2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -174,8 +174,8 @@ public final class ItemInstance extends WorldObject private final DropProtection _dropProtection = new DropProtection(); private final List _enchantOptions = new ArrayList<>(); - private final EnsoulOption[] _ensoulOptions = new EnsoulOption[3]; - private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[3]; + private final EnsoulOption[] _ensoulOptions = new EnsoulOption[2]; + private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[1]; /** * Constructor of the ItemInstance from the objectId and the itemId. @@ -2169,7 +2169,11 @@ public final class ItemInstance extends WorldObject public void addSpecialAbility(EnsoulOption option, int position, int type, boolean updateInDB) { - if ((position < 0) || (position > 2)) + if ((type == 1) && ((position < 0) || (position > 1))) // two first slots + { + return; + } + if ((type == 2) && (position != 0)) // third slot { return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java index 2684f5c240..5d85fa47e2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -174,8 +174,8 @@ public final class ItemInstance extends WorldObject private final DropProtection _dropProtection = new DropProtection(); private final List _enchantOptions = new ArrayList<>(); - private final EnsoulOption[] _ensoulOptions = new EnsoulOption[3]; - private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[3]; + private final EnsoulOption[] _ensoulOptions = new EnsoulOption[2]; + private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[1]; /** * Constructor of the ItemInstance from the objectId and the itemId. @@ -2169,7 +2169,11 @@ public final class ItemInstance extends WorldObject public void addSpecialAbility(EnsoulOption option, int position, int type, boolean updateInDB) { - if ((position < 0) || (position > 2)) + if ((type == 1) && ((position < 0) || (position > 1))) // two first slots + { + return; + } + if ((type == 2) && (position != 0)) // third slot { return; }