diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 215f808c41..27f3908f27 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -434,8 +434,12 @@ public abstract class Inventory extends ItemContainer } } - // Apply skill, if weapon have "skills on unequip" - it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player)); + // Apply skill, if item has "skills on unequip" and it is not a secondary agathion. + if ((slot < PAPERDOLL_AGATHION2) || (slot > PAPERDOLL_AGATHION5)) + { + it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player)); + } + if (update) { player.sendSkillList(); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index d9fe51d9ae..32ecd7a9b8 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -457,8 +457,12 @@ public abstract class Inventory extends ItemContainer } } - // Apply skill, if weapon have "skills on unequip" - it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player)); + // Apply skill, if item has "skills on unequip" and it is not a secondary agathion. + if ((slot < PAPERDOLL_AGATHION2) || (slot > PAPERDOLL_AGATHION5)) + { + it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player)); + } + if (update) { player.sendSkillList(); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index d9fe51d9ae..32ecd7a9b8 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -457,8 +457,12 @@ public abstract class Inventory extends ItemContainer } } - // Apply skill, if weapon have "skills on unequip" - it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player)); + // Apply skill, if item has "skills on unequip" and it is not a secondary agathion. + if ((slot < PAPERDOLL_AGATHION2) || (slot > PAPERDOLL_AGATHION5)) + { + it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player)); + } + if (update) { player.sendSkillList(); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index e94d279cee..941dfd8b3a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -457,8 +457,12 @@ public abstract class Inventory extends ItemContainer } } - // Apply skill, if weapon have "skills on unequip" - it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player)); + // Apply skill, if item has "skills on unequip" and it is not a secondary agathion. + if ((slot < PAPERDOLL_AGATHION2) || (slot > PAPERDOLL_AGATHION5)) + { + it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player)); + } + if (update) { player.sendSkillList(); diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 23954a6eb0..157c2d27ba 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -458,8 +458,12 @@ public abstract class Inventory extends ItemContainer } } - // Apply skill, if weapon have "skills on unequip" - it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player)); + // Apply skill, if item has "skills on unequip" and it is not a secondary agathion. + if ((slot < PAPERDOLL_AGATHION2) || (slot > PAPERDOLL_AGATHION5)) + { + it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player)); + } + if (update) { player.sendSkillList(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 088fc3a503..0e8e5372d2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -434,8 +434,12 @@ public abstract class Inventory extends ItemContainer } } - // Apply skill, if weapon have "skills on unequip" - it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player)); + // Apply skill, if item has "skills on unequip" and it is not a secondary agathion. + if ((slot < PAPERDOLL_AGATHION2) || (slot > PAPERDOLL_AGATHION5)) + { + it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player)); + } + if (update) { player.sendSkillList(); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index c87b9657a8..a7689a13bc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -457,8 +457,12 @@ public abstract class Inventory extends ItemContainer } } - // Apply skill, if weapon have "skills on unequip" - it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player)); + // Apply skill, if item has "skills on unequip" and it is not a secondary agathion. + if ((slot < PAPERDOLL_AGATHION2) || (slot > PAPERDOLL_AGATHION5)) + { + it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player)); + } + if (update) { player.sendSkillList(); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index c87b9657a8..a7689a13bc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -457,8 +457,12 @@ public abstract class Inventory extends ItemContainer } } - // Apply skill, if weapon have "skills on unequip" - it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player)); + // Apply skill, if item has "skills on unequip" and it is not a secondary agathion. + if ((slot < PAPERDOLL_AGATHION2) || (slot > PAPERDOLL_AGATHION5)) + { + it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player)); + } + if (update) { player.sendSkillList(); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index e94d279cee..941dfd8b3a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -457,8 +457,12 @@ public abstract class Inventory extends ItemContainer } } - // Apply skill, if weapon have "skills on unequip" - it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player)); + // Apply skill, if item has "skills on unequip" and it is not a secondary agathion. + if ((slot < PAPERDOLL_AGATHION2) || (slot > PAPERDOLL_AGATHION5)) + { + it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player)); + } + if (update) { player.sendSkillList(); diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index e94d279cee..941dfd8b3a 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -457,8 +457,12 @@ public abstract class Inventory extends ItemContainer } } - // Apply skill, if weapon have "skills on unequip" - it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player)); + // Apply skill, if item has "skills on unequip" and it is not a secondary agathion. + if ((slot < PAPERDOLL_AGATHION2) || (slot > PAPERDOLL_AGATHION5)) + { + it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player)); + } + if (update) { player.sendSkillList();