Reworked Item giveSkillsToOwner method.

Thanks to veriongt.

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -2008,14 +2008,17 @@ public class Item extends WorldObject
 	
 	public void giveSkillsToOwner()
 	{
-		if (!hasPassiveSkills())
+		if (!isEquipped() && !hasPassiveSkills())
 		{
 			return;
 		}
 		
 		final Player player = getActingPlayer();
-		if (player != null)
+		if (player == null)
 		{
+			return;
+		}
+		
 		_itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder ->
 		{
 			final Skill skill = holder.getSkill();
@@ -2024,7 +2027,15 @@ public class Item extends WorldObject
 				player.addSkill(skill, false);
 			}
 		});
+		
+		_itemTemplate.forEachSkill(ItemSkillType.ON_ENCHANT, holder ->
+		{
+			final Skill skill = holder.getSkill();
+			if (skill.isPassive() && (getEnchantLevel() >= holder.getValue()))
+			{
+				player.addSkill(skill, false);
 			}
+		});
 	}
 	
 	public void removeSkillsFromOwner()

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -2019,14 +2019,17 @@ public class Item extends WorldObject
 	
 	public void giveSkillsToOwner()
 	{
-		if (!hasPassiveSkills())
+		if (!isEquipped() && !hasPassiveSkills())
 		{
 			return;
 		}
 		
 		final Player player = getActingPlayer();
-		if (player != null)
+		if (player == null)
 		{
+			return;
+		}
+		
 		_itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder ->
 		{
 			final Skill skill = holder.getSkill();
@@ -2035,7 +2038,15 @@ public class Item extends WorldObject
 				player.addSkill(skill, false);
 			}
 		});
+		
+		_itemTemplate.forEachSkill(ItemSkillType.ON_ENCHANT, holder ->
+		{
+			final Skill skill = holder.getSkill();
+			if (skill.isPassive() && (getEnchantLevel() >= holder.getValue()))
+			{
+				player.addSkill(skill, false);
 			}
+		});
 	}
 	
 	public void removeSkillsFromOwner()

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -2019,14 +2019,17 @@ public class Item extends WorldObject
 	
 	public void giveSkillsToOwner()
 	{
-		if (!hasPassiveSkills())
+		if (!isEquipped() && !hasPassiveSkills())
 		{
 			return;
 		}
 		
 		final Player player = getActingPlayer();
-		if (player != null)
+		if (player == null)
 		{
+			return;
+		}
+		
 		_itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder ->
 		{
 			final Skill skill = holder.getSkill();
@@ -2035,7 +2038,15 @@ public class Item extends WorldObject
 				player.addSkill(skill, false);
 			}
 		});
+		
+		_itemTemplate.forEachSkill(ItemSkillType.ON_ENCHANT, holder ->
+		{
+			final Skill skill = holder.getSkill();
+			if (skill.isPassive() && (getEnchantLevel() >= holder.getValue()))
+			{
+				player.addSkill(skill, false);
 			}
+		});
 	}
 	
 	public void removeSkillsFromOwner()

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -2019,14 +2019,17 @@ public class Item extends WorldObject
 	
 	public void giveSkillsToOwner()
 	{
-		if (!hasPassiveSkills())
+		if (!isEquipped() && !hasPassiveSkills())
 		{
 			return;
 		}
 		
 		final Player player = getActingPlayer();
-		if (player != null)
+		if (player == null)
 		{
+			return;
+		}
+		
 		_itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder ->
 		{
 			final Skill skill = holder.getSkill();
@@ -2035,7 +2038,15 @@ public class Item extends WorldObject
 				player.addSkill(skill, false);
 			}
 		});
+		
+		_itemTemplate.forEachSkill(ItemSkillType.ON_ENCHANT, holder ->
+		{
+			final Skill skill = holder.getSkill();
+			if (skill.isPassive() && (getEnchantLevel() >= holder.getValue()))
+			{
+				player.addSkill(skill, false);
 			}
+		});
 	}
 	
 	public void removeSkillsFromOwner()

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -2085,14 +2085,17 @@ public class Item extends WorldObject
 	
 	public void giveSkillsToOwner()
 	{
-		if (!hasPassiveSkills())
+		if (!isEquipped() && !hasPassiveSkills())
 		{
 			return;
 		}
 		
 		final Player player = getActingPlayer();
-		if (player != null)
+		if (player == null)
 		{
+			return;
+		}
+		
 		_itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder ->
 		{
 			final Skill skill = holder.getSkill();
@@ -2101,7 +2104,15 @@ public class Item extends WorldObject
 				player.addSkill(skill, false);
 			}
 		});
+		
+		_itemTemplate.forEachSkill(ItemSkillType.ON_ENCHANT, holder ->
+		{
+			final Skill skill = holder.getSkill();
+			if (skill.isPassive() && (getEnchantLevel() >= holder.getValue()))
+			{
+				player.addSkill(skill, false);
 			}
+		});
 	}
 	
 	public void removeSkillsFromOwner()

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -2085,14 +2085,17 @@ public class Item extends WorldObject
 	
 	public void giveSkillsToOwner()
 	{
-		if (!hasPassiveSkills())
+		if (!isEquipped() && !hasPassiveSkills())
 		{
 			return;
 		}
 		
 		final Player player = getActingPlayer();
-		if (player != null)
+		if (player == null)
 		{
+			return;
+		}
+		
 		_itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder ->
 		{
 			final Skill skill = holder.getSkill();
@@ -2101,7 +2104,15 @@ public class Item extends WorldObject
 				player.addSkill(skill, false);
 			}
 		});
+		
+		_itemTemplate.forEachSkill(ItemSkillType.ON_ENCHANT, holder ->
+		{
+			final Skill skill = holder.getSkill();
+			if (skill.isPassive() && (getEnchantLevel() >= holder.getValue()))
+			{
+				player.addSkill(skill, false);
 			}
+		});
 	}
 	
 	public void removeSkillsFromOwner()

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -2085,14 +2085,17 @@ public class Item extends WorldObject
 	
 	public void giveSkillsToOwner()
 	{
-		if (!hasPassiveSkills())
+		if (!isEquipped() && !hasPassiveSkills())
 		{
 			return;
 		}
 		
 		final Player player = getActingPlayer();
-		if (player != null)
+		if (player == null)
 		{
+			return;
+		}
+		
 		_itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder ->
 		{
 			final Skill skill = holder.getSkill();
@@ -2101,7 +2104,15 @@ public class Item extends WorldObject
 				player.addSkill(skill, false);
 			}
 		});
+		
+		_itemTemplate.forEachSkill(ItemSkillType.ON_ENCHANT, holder ->
+		{
+			final Skill skill = holder.getSkill();
+			if (skill.isPassive() && (getEnchantLevel() >= holder.getValue()))
+			{
+				player.addSkill(skill, false);
 			}
+		});
 	}
 	
 	public void removeSkillsFromOwner()

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -2085,14 +2085,17 @@ public class Item extends WorldObject
 	
 	public void giveSkillsToOwner()
 	{
-		if (!hasPassiveSkills())
+		if (!isEquipped() && !hasPassiveSkills())
 		{
 			return;
 		}
 		
 		final Player player = getActingPlayer();
-		if (player != null)
+		if (player == null)
 		{
+			return;
+		}
+		
 		_itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder ->
 		{
 			final Skill skill = holder.getSkill();
@@ -2101,7 +2104,15 @@ public class Item extends WorldObject
 				player.addSkill(skill, false);
 			}
 		});
+		
+		_itemTemplate.forEachSkill(ItemSkillType.ON_ENCHANT, holder ->
+		{
+			final Skill skill = holder.getSkill();
+			if (skill.isPassive() && (getEnchantLevel() >= holder.getValue()))
+			{
+				player.addSkill(skill, false);
 			}
+		});
 	}
 	
 	public void removeSkillsFromOwner()

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -2085,14 +2085,17 @@ public class Item extends WorldObject
 	
 	public void giveSkillsToOwner()
 	{
-		if (!hasPassiveSkills())
+		if (!isEquipped() && !hasPassiveSkills())
 		{
 			return;
 		}
 		
 		final Player player = getActingPlayer();
-		if (player != null)
+		if (player == null)
 		{
+			return;
+		}
+		
 		_itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder ->
 		{
 			final Skill skill = holder.getSkill();
@@ -2101,7 +2104,15 @@ public class Item extends WorldObject
 				player.addSkill(skill, false);
 			}
 		});
+		
+		_itemTemplate.forEachSkill(ItemSkillType.ON_ENCHANT, holder ->
+		{
+			final Skill skill = holder.getSkill();
+			if (skill.isPassive() && (getEnchantLevel() >= holder.getValue()))
+			{
+				player.addSkill(skill, false);
 			}
+		});
 	}
 	
 	public void removeSkillsFromOwner()

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -2085,14 +2085,17 @@ public class Item extends WorldObject
 	
 	public void giveSkillsToOwner()
 	{
-		if (!hasPassiveSkills())
+		if (!isEquipped() && !hasPassiveSkills())
 		{
 			return;
 		}
 		
 		final Player player = getActingPlayer();
-		if (player != null)
+		if (player == null)
 		{
+			return;
+		}
+		
 		_itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder ->
 		{
 			final Skill skill = holder.getSkill();
@@ -2101,7 +2104,15 @@ public class Item extends WorldObject
 				player.addSkill(skill, false);
 			}
 		});
+		
+		_itemTemplate.forEachSkill(ItemSkillType.ON_ENCHANT, holder ->
+		{
+			final Skill skill = holder.getSkill();
+			if (skill.isPassive() && (getEnchantLevel() >= holder.getValue()))
+			{
+				player.addSkill(skill, false);
 			}
+		});
 	}
 	
 	public void removeSkillsFromOwner()

L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -2094,14 +2094,17 @@ public class Item extends WorldObject
 	
 	public void giveSkillsToOwner()
 	{
-		if (!hasPassiveSkills())
+		if (!isEquipped() && !hasPassiveSkills())
 		{
 			return;
 		}
 		
 		final Player player = getActingPlayer();
-		if (player != null)
+		if (player == null)
 		{
+			return;
+		}
+		
 		_itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder ->
 		{
 			final Skill skill = holder.getSkill();
@@ -2110,7 +2113,15 @@ public class Item extends WorldObject
 				player.addSkill(skill, false);
 			}
 		});
+		
+		_itemTemplate.forEachSkill(ItemSkillType.ON_ENCHANT, holder ->
+		{
+			final Skill skill = holder.getSkill();
+			if (skill.isPassive() && (getEnchantLevel() >= holder.getValue()))
+			{
+				player.addSkill(skill, false);
 			}
+		});
 	}
 	
 	public void removeSkillsFromOwner()

L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -2097,14 +2097,17 @@ public class Item extends WorldObject
 	
 	public void giveSkillsToOwner()
 	{
-		if (!hasPassiveSkills())
+		if (!isEquipped() && !hasPassiveSkills())
 		{
 			return;
 		}
 		
 		final Player player = getActingPlayer();
-		if (player != null)
+		if (player == null)
 		{
+			return;
+		}
+		
 		_itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder ->
 		{
 			final Skill skill = holder.getSkill();
@@ -2113,7 +2116,15 @@ public class Item extends WorldObject
 				player.addSkill(skill, false);
 			}
 		});
+		
+		_itemTemplate.forEachSkill(ItemSkillType.ON_ENCHANT, holder ->
+		{
+			final Skill skill = holder.getSkill();
+			if (skill.isPassive() && (getEnchantLevel() >= holder.getValue()))
+			{
+				player.addSkill(skill, false);
 			}
+		});
 	}
 	
 	public void removeSkillsFromOwner()

L2J_Mobius_11.2_AgeOfMagic/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -2097,14 +2097,17 @@ public class Item extends WorldObject
 	
 	public void giveSkillsToOwner()
 	{
-		if (!hasPassiveSkills())
+		if (!isEquipped() && !hasPassiveSkills())
 		{
 			return;
 		}
 		
 		final Player player = getActingPlayer();
-		if (player != null)
+		if (player == null)
 		{
+			return;
+		}
+		
 		_itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder ->
 		{
 			final Skill skill = holder.getSkill();
@@ -2113,7 +2116,15 @@ public class Item extends WorldObject
 				player.addSkill(skill, false);
 			}
 		});
+		
+		_itemTemplate.forEachSkill(ItemSkillType.ON_ENCHANT, holder ->
+		{
+			final Skill skill = holder.getSkill();
+			if (skill.isPassive() && (getEnchantLevel() >= holder.getValue()))
+			{
+				player.addSkill(skill, false);
 			}
+		});
 	}
 	
 	public void removeSkillsFromOwner()

L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -68,6 +68,7 @@ import org.l2jmobius.gameserver.model.item.type.ItemType;
 import org.l2jmobius.gameserver.model.options.EnchantOptions;
 import org.l2jmobius.gameserver.model.options.Options;
 import org.l2jmobius.gameserver.model.quest.QuestState;
+import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.functions.AbstractFunction;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.DropItem;
@@ -1741,21 +1742,23 @@ public class Item extends WorldObject
 	
 	public void giveSkillsToOwner()
 	{
-		if (!hasPassiveSkills())
+		if (!isEquipped() && !hasPassiveSkills())
 		{
 			return;
 		}
 		
 		final Player player = getActingPlayer();
-		
-		if (player != null)
+		if (player == null)
 		{
-			for (SkillHolder sh : _itemTemplate.getSkills())
-			{
-				if (sh.getSkill().isPassive())
-				{
-					player.addSkill(sh.getSkill(), false);
+			return;
 		}
+		
+		for (SkillHolder holder : _itemTemplate.getSkills())
+		{
+			final Skill skill = holder.getSkill();
+			if (skill.isPassive())
+			{
+				player.addSkill(skill, false);
 			}
 		}
 	}
@@ -1768,14 +1771,14 @@ public class Item extends WorldObject
 		}
 		
 		final Player player = getActingPlayer();
-		
 		if (player != null)
 		{
-			for (SkillHolder sh : _itemTemplate.getSkills())
+			for (SkillHolder holder : _itemTemplate.getSkills())
 			{
-				if (sh.getSkill().isPassive())
+				final Skill skill = holder.getSkill();
+				if (skill.isPassive())
 				{
-					player.removeSkill(sh.getSkill(), false, true);
+					player.removeSkill(skill, false, true);
 				}
 			}
 		}

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -69,6 +69,7 @@ import org.l2jmobius.gameserver.model.item.type.ItemType;
 import org.l2jmobius.gameserver.model.options.EnchantOptions;
 import org.l2jmobius.gameserver.model.options.Options;
 import org.l2jmobius.gameserver.model.quest.QuestState;
+import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.functions.AbstractFunction;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.DropItem;
@@ -1996,21 +1997,23 @@ public class Item extends WorldObject
 	
 	public void giveSkillsToOwner()
 	{
-		if (!hasPassiveSkills())
+		if (!isEquipped() && !hasPassiveSkills())
 		{
 			return;
 		}
 		
 		final Player player = getActingPlayer();
-		
-		if (player != null)
+		if (player == null)
 		{
-			for (SkillHolder sh : _itemTemplate.getSkills())
-			{
-				if (sh.getSkill().isPassive())
-				{
-					player.addSkill(sh.getSkill(), false);
+			return;
 		}
+		
+		for (SkillHolder holder : _itemTemplate.getSkills())
+		{
+			final Skill skill = holder.getSkill();
+			if (skill.isPassive())
+			{
+				player.addSkill(skill, false);
 			}
 		}
 	}
@@ -2023,14 +2026,14 @@ public class Item extends WorldObject
 		}
 		
 		final Player player = getActingPlayer();
-		
 		if (player != null)
 		{
-			for (SkillHolder sh : _itemTemplate.getSkills())
+			for (SkillHolder holder : _itemTemplate.getSkills())
 			{
-				if (sh.getSkill().isPassive())
+				final Skill skill = holder.getSkill();
+				if (skill.isPassive())
 				{
-					player.removeSkill(sh.getSkill(), false, true);
+					player.removeSkill(skill, false, true);
 				}
 			}
 		}

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -69,6 +69,7 @@ import org.l2jmobius.gameserver.model.item.type.ItemType;
 import org.l2jmobius.gameserver.model.options.EnchantOptions;
 import org.l2jmobius.gameserver.model.options.Options;
 import org.l2jmobius.gameserver.model.quest.QuestState;
+import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.functions.AbstractFunction;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.DropItem;
@@ -1996,21 +1997,23 @@ public class Item extends WorldObject
 	
 	public void giveSkillsToOwner()
 	{
-		if (!hasPassiveSkills())
+		if (!isEquipped() && !hasPassiveSkills())
 		{
 			return;
 		}
 		
 		final Player player = getActingPlayer();
-		
-		if (player != null)
+		if (player == null)
 		{
-			for (SkillHolder sh : _itemTemplate.getSkills())
-			{
-				if (sh.getSkill().isPassive())
-				{
-					player.addSkill(sh.getSkill(), false);
+			return;
 		}
+		
+		for (SkillHolder holder : _itemTemplate.getSkills())
+		{
+			final Skill skill = holder.getSkill();
+			if (skill.isPassive())
+			{
+				player.addSkill(skill, false);
 			}
 		}
 	}
@@ -2023,14 +2026,14 @@ public class Item extends WorldObject
 		}
 		
 		final Player player = getActingPlayer();
-		
 		if (player != null)
 		{
-			for (SkillHolder sh : _itemTemplate.getSkills())
+			for (SkillHolder holder : _itemTemplate.getSkills())
 			{
-				if (sh.getSkill().isPassive())
+				final Skill skill = holder.getSkill();
+				if (skill.isPassive())
 				{
-					player.removeSkill(sh.getSkill(), false, true);
+					player.removeSkill(skill, false, true);
 				}
 			}
 		}

L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -2010,14 +2010,17 @@ public class Item extends WorldObject
 	
 	public void giveSkillsToOwner()
 	{
-		if (!hasPassiveSkills())
+		if (!isEquipped() && !hasPassiveSkills())
 		{
 			return;
 		}
 		
 		final Player player = getActingPlayer();
-		if (player != null)
+		if (player == null)
 		{
+			return;
+		}
+		
 		_itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder ->
 		{
 			final Skill skill = holder.getSkill();
@@ -2026,7 +2029,15 @@ public class Item extends WorldObject
 				player.addSkill(skill, false);
 			}
 		});
+		
+		_itemTemplate.forEachSkill(ItemSkillType.ON_ENCHANT, holder ->
+		{
+			final Skill skill = holder.getSkill();
+			if (skill.isPassive() && (getEnchantLevel() >= holder.getValue()))
+			{
+				player.addSkill(skill, false);
 			}
+		});
 	}
 	
 	public void removeSkillsFromOwner()

L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -2010,14 +2010,17 @@ public class Item extends WorldObject
 	
 	public void giveSkillsToOwner()
 	{
-		if (!hasPassiveSkills())
+		if (!isEquipped() && !hasPassiveSkills())
 		{
 			return;
 		}
 		
 		final Player player = getActingPlayer();
-		if (player != null)
+		if (player == null)
 		{
+			return;
+		}
+		
 		_itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder ->
 		{
 			final Skill skill = holder.getSkill();
@@ -2026,7 +2029,15 @@ public class Item extends WorldObject
 				player.addSkill(skill, false);
 			}
 		});
+		
+		_itemTemplate.forEachSkill(ItemSkillType.ON_ENCHANT, holder ->
+		{
+			final Skill skill = holder.getSkill();
+			if (skill.isPassive() && (getEnchantLevel() >= holder.getValue()))
+			{
+				player.addSkill(skill, false);
 			}
+		});
 	}
 	
 	public void removeSkillsFromOwner()

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -2019,14 +2019,17 @@ public class Item extends WorldObject
 	
 	public void giveSkillsToOwner()
 	{
-		if (!hasPassiveSkills())
+		if (!isEquipped() && !hasPassiveSkills())
 		{
 			return;
 		}
 		
 		final Player player = getActingPlayer();
-		if (player != null)
+		if (player == null)
 		{
+			return;
+		}
+		
 		_itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder ->
 		{
 			final Skill skill = holder.getSkill();
@@ -2035,7 +2038,15 @@ public class Item extends WorldObject
 				player.addSkill(skill, false);
 			}
 		});
+		
+		_itemTemplate.forEachSkill(ItemSkillType.ON_ENCHANT, holder ->
+		{
+			final Skill skill = holder.getSkill();
+			if (skill.isPassive() && (getEnchantLevel() >= holder.getValue()))
+			{
+				player.addSkill(skill, false);
 			}
+		});
 	}
 	
 	public void removeSkillsFromOwner()

L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -2019,14 +2019,17 @@ public class Item extends WorldObject
 	
 	public void giveSkillsToOwner()
 	{
-		if (!hasPassiveSkills())
+		if (!isEquipped() && !hasPassiveSkills())
 		{
 			return;
 		}
 		
 		final Player player = getActingPlayer();
-		if (player != null)
+		if (player == null)
 		{
+			return;
+		}
+		
 		_itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder ->
 		{
 			final Skill skill = holder.getSkill();
@@ -2035,7 +2038,15 @@ public class Item extends WorldObject
 				player.addSkill(skill, false);
 			}
 		});
+		
+		_itemTemplate.forEachSkill(ItemSkillType.ON_ENCHANT, holder ->
+		{
+			final Skill skill = holder.getSkill();
+			if (skill.isPassive() && (getEnchantLevel() >= holder.getValue()))
+			{
+				player.addSkill(skill, false);
 			}
+		});
 	}
 	
 	public void removeSkillsFromOwner()

L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -2070,14 +2070,17 @@ public class Item extends WorldObject
 	
 	public void giveSkillsToOwner()
 	{
-		if (!hasPassiveSkills())
+		if (!isEquipped() && !hasPassiveSkills())
 		{
 			return;
 		}
 		
 		final Player player = getActingPlayer();
-		if (player != null)
+		if (player == null)
 		{
+			return;
+		}
+		
 		_itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder ->
 		{
 			final Skill skill = holder.getSkill();
@@ -2086,7 +2089,15 @@ public class Item extends WorldObject
 				player.addSkill(skill, false);
 			}
 		});
+		
+		_itemTemplate.forEachSkill(ItemSkillType.ON_ENCHANT, holder ->
+		{
+			final Skill skill = holder.getSkill();
+			if (skill.isPassive() && (getEnchantLevel() >= holder.getValue()))
+			{
+				player.addSkill(skill, false);
 			}
+		});
 	}
 	
 	public void removeSkillsFromOwner()

L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -2070,14 +2070,17 @@ public class Item extends WorldObject
 	
 	public void giveSkillsToOwner()
 	{
-		if (!hasPassiveSkills())
+		if (!isEquipped() && !hasPassiveSkills())
 		{
 			return;
 		}
 		
 		final Player player = getActingPlayer();
-		if (player != null)
+		if (player == null)
 		{
+			return;
+		}
+		
 		_itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder ->
 		{
 			final Skill skill = holder.getSkill();
@@ -2086,7 +2089,15 @@ public class Item extends WorldObject
 				player.addSkill(skill, false);
 			}
 		});
+		
+		_itemTemplate.forEachSkill(ItemSkillType.ON_ENCHANT, holder ->
+		{
+			final Skill skill = holder.getSkill();
+			if (skill.isPassive() && (getEnchantLevel() >= holder.getValue()))
+			{
+				player.addSkill(skill, false);
 			}
+		});
 	}
 	
 	public void removeSkillsFromOwner()

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -2070,14 +2070,17 @@ public class Item extends WorldObject
 	
 	public void giveSkillsToOwner()
 	{
-		if (!hasPassiveSkills())
+		if (!isEquipped() && !hasPassiveSkills())
 		{
 			return;
 		}
 		
 		final Player player = getActingPlayer();
-		if (player != null)
+		if (player == null)
 		{
+			return;
+		}
+		
 		_itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder ->
 		{
 			final Skill skill = holder.getSkill();
@@ -2086,7 +2089,15 @@ public class Item extends WorldObject
 				player.addSkill(skill, false);
 			}
 		});
+		
+		_itemTemplate.forEachSkill(ItemSkillType.ON_ENCHANT, holder ->
+		{
+			final Skill skill = holder.getSkill();
+			if (skill.isPassive() && (getEnchantLevel() >= holder.getValue()))
+			{
+				player.addSkill(skill, false);
 			}
+		});
 	}
 	
 	public void removeSkillsFromOwner()

L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -2070,14 +2070,17 @@ public class Item extends WorldObject
 	
 	public void giveSkillsToOwner()
 	{
-		if (!hasPassiveSkills())
+		if (!isEquipped() && !hasPassiveSkills())
 		{
 			return;
 		}
 		
 		final Player player = getActingPlayer();
-		if (player != null)
+		if (player == null)
 		{
+			return;
+		}
+		
 		_itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder ->
 		{
 			final Skill skill = holder.getSkill();
@@ -2086,7 +2089,15 @@ public class Item extends WorldObject
 				player.addSkill(skill, false);
 			}
 		});
+		
+		_itemTemplate.forEachSkill(ItemSkillType.ON_ENCHANT, holder ->
+		{
+			final Skill skill = holder.getSkill();
+			if (skill.isPassive() && (getEnchantLevel() >= holder.getValue()))
+			{
+				player.addSkill(skill, false);
 			}
+		});
 	}
 	
 	public void removeSkillsFromOwner()

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -2070,14 +2070,17 @@ public class Item extends WorldObject
 	
 	public void giveSkillsToOwner()
 	{
-		if (!hasPassiveSkills())
+		if (!isEquipped() && !hasPassiveSkills())
 		{
 			return;
 		}
 		
 		final Player player = getActingPlayer();
-		if (player != null)
+		if (player == null)
 		{
+			return;
+		}
+		
 		_itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder ->
 		{
 			final Skill skill = holder.getSkill();
@@ -2086,7 +2089,15 @@ public class Item extends WorldObject
 				player.addSkill(skill, false);
 			}
 		});
+		
+		_itemTemplate.forEachSkill(ItemSkillType.ON_ENCHANT, holder ->
+		{
+			final Skill skill = holder.getSkill();
+			if (skill.isPassive() && (getEnchantLevel() >= holder.getValue()))
+			{
+				player.addSkill(skill, false);
 			}
+		});
 	}
 	
 	public void removeSkillsFromOwner()

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -2002,14 +2002,17 @@ public class Item extends WorldObject
 	
 	public void giveSkillsToOwner()
 	{
-		if (!hasPassiveSkills())
+		if (!isEquipped() && !hasPassiveSkills())
 		{
 			return;
 		}
 		
 		final Player player = getActingPlayer();
-		if (player != null)
+		if (player == null)
 		{
+			return;
+		}
+		
 		_itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder ->
 		{
 			final Skill skill = holder.getSkill();
@@ -2018,7 +2021,15 @@ public class Item extends WorldObject
 				player.addSkill(skill, false);
 			}
 		});
+		
+		_itemTemplate.forEachSkill(ItemSkillType.ON_ENCHANT, holder ->
+		{
+			final Skill skill = holder.getSkill();
+			if (skill.isPassive() && (getEnchantLevel() >= holder.getValue()))
+			{
+				player.addSkill(skill, false);
 			}
+		});
 	}
 	
 	public void removeSkillsFromOwner()

L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -2073,14 +2073,17 @@ public class Item extends WorldObject
 	
 	public void giveSkillsToOwner()
 	{
-		if (!hasPassiveSkills())
+		if (!isEquipped() && !hasPassiveSkills())
 		{
 			return;
 		}
 		
 		final Player player = getActingPlayer();
-		if (player != null)
+		if (player == null)
 		{
+			return;
+		}
+		
 		_itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder ->
 		{
 			final Skill skill = holder.getSkill();
@@ -2089,7 +2092,15 @@ public class Item extends WorldObject
 				player.addSkill(skill, false);
 			}
 		});
+		
+		_itemTemplate.forEachSkill(ItemSkillType.ON_ENCHANT, holder ->
+		{
+			final Skill skill = holder.getSkill();
+			if (skill.isPassive() && (getEnchantLevel() >= holder.getValue()))
+			{
+				player.addSkill(skill, false);
 			}
+		});
 	}
 	
 	public void removeSkillsFromOwner()

L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -2073,14 +2073,17 @@ public class Item extends WorldObject
 	
 	public void giveSkillsToOwner()
 	{
-		if (!hasPassiveSkills())
+		if (!isEquipped() && !hasPassiveSkills())
 		{
 			return;
 		}
 		
 		final Player player = getActingPlayer();
-		if (player != null)
+		if (player == null)
 		{
+			return;
+		}
+		
 		_itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder ->
 		{
 			final Skill skill = holder.getSkill();
@@ -2089,7 +2092,15 @@ public class Item extends WorldObject
 				player.addSkill(skill, false);
 			}
 		});
+		
+		_itemTemplate.forEachSkill(ItemSkillType.ON_ENCHANT, holder ->
+		{
+			final Skill skill = holder.getSkill();
+			if (skill.isPassive() && (getEnchantLevel() >= holder.getValue()))
+			{
+				player.addSkill(skill, false);
 			}
+		});
 	}
 	
 	public void removeSkillsFromOwner()

L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -2083,14 +2083,17 @@ public class Item extends WorldObject
 	
 	public void giveSkillsToOwner()
 	{
-		if (!hasPassiveSkills())
+		if (!isEquipped() && !hasPassiveSkills())
 		{
 			return;
 		}
 		
 		final Player player = getActingPlayer();
-		if (player != null)
+		if (player == null)
 		{
+			return;
+		}
+		
 		_itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder ->
 		{
 			final Skill skill = holder.getSkill();
@@ -2099,7 +2102,15 @@ public class Item extends WorldObject
 				player.addSkill(skill, false);
 			}
 		});
+		
+		_itemTemplate.forEachSkill(ItemSkillType.ON_ENCHANT, holder ->
+		{
+			final Skill skill = holder.getSkill();
+			if (skill.isPassive() && (getEnchantLevel() >= holder.getValue()))
+			{
+				player.addSkill(skill, false);
 			}
+		});
 	}
 	
 	public void removeSkillsFromOwner()

L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -2086,14 +2086,17 @@ public class Item extends WorldObject
 	
 	public void giveSkillsToOwner()
 	{
-		if (!hasPassiveSkills())
+		if (!isEquipped() && !hasPassiveSkills())
 		{
 			return;
 		}
 		
 		final Player player = getActingPlayer();
-		if (player != null)
+		if (player == null)
 		{
+			return;
+		}
+		
 		_itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder ->
 		{
 			final Skill skill = holder.getSkill();
@@ -2102,7 +2105,15 @@ public class Item extends WorldObject
 				player.addSkill(skill, false);
 			}
 		});
+		
+		_itemTemplate.forEachSkill(ItemSkillType.ON_ENCHANT, holder ->
+		{
+			final Skill skill = holder.getSkill();
+			if (skill.isPassive() && (getEnchantLevel() >= holder.getValue()))
+			{
+				player.addSkill(skill, false);
 			}
+		});
 	}
 	
 	public void removeSkillsFromOwner()

L2J_Mobius_Essence_7.2_AztacansTemple/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -2086,14 +2086,17 @@ public class Item extends WorldObject
 	
 	public void giveSkillsToOwner()
 	{
-		if (!hasPassiveSkills())
+		if (!isEquipped() && !hasPassiveSkills())
 		{
 			return;
 		}
 		
 		final Player player = getActingPlayer();
-		if (player != null)
+		if (player == null)
 		{
+			return;
+		}
+		
 		_itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder ->
 		{
 			final Skill skill = holder.getSkill();
@@ -2102,7 +2105,15 @@ public class Item extends WorldObject
 				player.addSkill(skill, false);
 			}
 		});
+		
+		_itemTemplate.forEachSkill(ItemSkillType.ON_ENCHANT, holder ->
+		{
+			final Skill skill = holder.getSkill();
+			if (skill.isPassive() && (getEnchantLevel() >= holder.getValue()))
+			{
+				player.addSkill(skill, false);
 			}
+		});
 	}
 	
 	public void removeSkillsFromOwner()