diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
index 091b7c27b7..61abadc33c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
@@ -20,7 +20,6 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
@@ -45,49 +44,15 @@ public class OpEquipItemSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				for (Item item : caster.getInventory().getPaperdollItems())
-				{
-					if (item.getId() == _itemId)
-					{
-						return true;
-					}
-				}
-				return false;
+				return caster.getInventory().isItemEquipped(_itemId);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : target.getActingPlayer().getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							return true;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId);
 			}
 			case BOTH:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : caster.getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							for (Item i : target.getActingPlayer().getInventory().getPaperdollItems())
-							{
-								if (i.getId() == _itemId)
-								{
-									return true;
-								}
-							}
-							return false;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId) && caster.getInventory().isItemEquipped(_itemId);
 			}
 		}
 		return false;
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
index 091b7c27b7..61abadc33c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
@@ -20,7 +20,6 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
@@ -45,49 +44,15 @@ public class OpEquipItemSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				for (Item item : caster.getInventory().getPaperdollItems())
-				{
-					if (item.getId() == _itemId)
-					{
-						return true;
-					}
-				}
-				return false;
+				return caster.getInventory().isItemEquipped(_itemId);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : target.getActingPlayer().getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							return true;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId);
 			}
 			case BOTH:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : caster.getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							for (Item i : target.getActingPlayer().getInventory().getPaperdollItems())
-							{
-								if (i.getId() == _itemId)
-								{
-									return true;
-								}
-							}
-							return false;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId) && caster.getInventory().isItemEquipped(_itemId);
 			}
 		}
 		return false;
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
index 091b7c27b7..61abadc33c 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
@@ -20,7 +20,6 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
@@ -45,49 +44,15 @@ public class OpEquipItemSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				for (Item item : caster.getInventory().getPaperdollItems())
-				{
-					if (item.getId() == _itemId)
-					{
-						return true;
-					}
-				}
-				return false;
+				return caster.getInventory().isItemEquipped(_itemId);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : target.getActingPlayer().getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							return true;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId);
 			}
 			case BOTH:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : caster.getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							for (Item i : target.getActingPlayer().getInventory().getPaperdollItems())
-							{
-								if (i.getId() == _itemId)
-								{
-									return true;
-								}
-							}
-							return false;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId) && caster.getInventory().isItemEquipped(_itemId);
 			}
 		}
 		return false;
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
index 091b7c27b7..61abadc33c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
@@ -20,7 +20,6 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
@@ -45,49 +44,15 @@ public class OpEquipItemSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				for (Item item : caster.getInventory().getPaperdollItems())
-				{
-					if (item.getId() == _itemId)
-					{
-						return true;
-					}
-				}
-				return false;
+				return caster.getInventory().isItemEquipped(_itemId);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : target.getActingPlayer().getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							return true;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId);
 			}
 			case BOTH:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : caster.getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							for (Item i : target.getActingPlayer().getInventory().getPaperdollItems())
-							{
-								if (i.getId() == _itemId)
-								{
-									return true;
-								}
-							}
-							return false;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId) && caster.getInventory().isItemEquipped(_itemId);
 			}
 		}
 		return false;
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
index 091b7c27b7..61abadc33c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
@@ -20,7 +20,6 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
@@ -45,49 +44,15 @@ public class OpEquipItemSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				for (Item item : caster.getInventory().getPaperdollItems())
-				{
-					if (item.getId() == _itemId)
-					{
-						return true;
-					}
-				}
-				return false;
+				return caster.getInventory().isItemEquipped(_itemId);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : target.getActingPlayer().getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							return true;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId);
 			}
 			case BOTH:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : caster.getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							for (Item i : target.getActingPlayer().getInventory().getPaperdollItems())
-							{
-								if (i.getId() == _itemId)
-								{
-									return true;
-								}
-							}
-							return false;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId) && caster.getInventory().isItemEquipped(_itemId);
 			}
 		}
 		return false;
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
index 091b7c27b7..61abadc33c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
@@ -20,7 +20,6 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
@@ -45,49 +44,15 @@ public class OpEquipItemSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				for (Item item : caster.getInventory().getPaperdollItems())
-				{
-					if (item.getId() == _itemId)
-					{
-						return true;
-					}
-				}
-				return false;
+				return caster.getInventory().isItemEquipped(_itemId);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : target.getActingPlayer().getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							return true;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId);
 			}
 			case BOTH:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : caster.getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							for (Item i : target.getActingPlayer().getInventory().getPaperdollItems())
-							{
-								if (i.getId() == _itemId)
-								{
-									return true;
-								}
-							}
-							return false;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId) && caster.getInventory().isItemEquipped(_itemId);
 			}
 		}
 		return false;
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
index 091b7c27b7..61abadc33c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
@@ -20,7 +20,6 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
@@ -45,49 +44,15 @@ public class OpEquipItemSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				for (Item item : caster.getInventory().getPaperdollItems())
-				{
-					if (item.getId() == _itemId)
-					{
-						return true;
-					}
-				}
-				return false;
+				return caster.getInventory().isItemEquipped(_itemId);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : target.getActingPlayer().getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							return true;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId);
 			}
 			case BOTH:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : caster.getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							for (Item i : target.getActingPlayer().getInventory().getPaperdollItems())
-							{
-								if (i.getId() == _itemId)
-								{
-									return true;
-								}
-							}
-							return false;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId) && caster.getInventory().isItemEquipped(_itemId);
 			}
 		}
 		return false;
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
index 091b7c27b7..61abadc33c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
@@ -20,7 +20,6 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
@@ -45,49 +44,15 @@ public class OpEquipItemSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				for (Item item : caster.getInventory().getPaperdollItems())
-				{
-					if (item.getId() == _itemId)
-					{
-						return true;
-					}
-				}
-				return false;
+				return caster.getInventory().isItemEquipped(_itemId);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : target.getActingPlayer().getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							return true;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId);
 			}
 			case BOTH:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : caster.getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							for (Item i : target.getActingPlayer().getInventory().getPaperdollItems())
-							{
-								if (i.getId() == _itemId)
-								{
-									return true;
-								}
-							}
-							return false;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId) && caster.getInventory().isItemEquipped(_itemId);
 			}
 		}
 		return false;
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
index 091b7c27b7..61abadc33c 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
@@ -20,7 +20,6 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
@@ -45,49 +44,15 @@ public class OpEquipItemSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				for (Item item : caster.getInventory().getPaperdollItems())
-				{
-					if (item.getId() == _itemId)
-					{
-						return true;
-					}
-				}
-				return false;
+				return caster.getInventory().isItemEquipped(_itemId);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : target.getActingPlayer().getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							return true;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId);
 			}
 			case BOTH:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : caster.getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							for (Item i : target.getActingPlayer().getInventory().getPaperdollItems())
-							{
-								if (i.getId() == _itemId)
-								{
-									return true;
-								}
-							}
-							return false;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId) && caster.getInventory().isItemEquipped(_itemId);
 			}
 		}
 		return false;
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
index 091b7c27b7..61abadc33c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
@@ -20,7 +20,6 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
@@ -45,49 +44,15 @@ public class OpEquipItemSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				for (Item item : caster.getInventory().getPaperdollItems())
-				{
-					if (item.getId() == _itemId)
-					{
-						return true;
-					}
-				}
-				return false;
+				return caster.getInventory().isItemEquipped(_itemId);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : target.getActingPlayer().getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							return true;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId);
 			}
 			case BOTH:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : caster.getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							for (Item i : target.getActingPlayer().getInventory().getPaperdollItems())
-							{
-								if (i.getId() == _itemId)
-								{
-									return true;
-								}
-							}
-							return false;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId) && caster.getInventory().isItemEquipped(_itemId);
 			}
 		}
 		return false;
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
index 091b7c27b7..61abadc33c 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
@@ -20,7 +20,6 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
@@ -45,49 +44,15 @@ public class OpEquipItemSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				for (Item item : caster.getInventory().getPaperdollItems())
-				{
-					if (item.getId() == _itemId)
-					{
-						return true;
-					}
-				}
-				return false;
+				return caster.getInventory().isItemEquipped(_itemId);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : target.getActingPlayer().getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							return true;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId);
 			}
 			case BOTH:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : caster.getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							for (Item i : target.getActingPlayer().getInventory().getPaperdollItems())
-							{
-								if (i.getId() == _itemId)
-								{
-									return true;
-								}
-							}
-							return false;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId) && caster.getInventory().isItemEquipped(_itemId);
 			}
 		}
 		return false;
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
index 091b7c27b7..61abadc33c 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
@@ -20,7 +20,6 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
@@ -45,49 +44,15 @@ public class OpEquipItemSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				for (Item item : caster.getInventory().getPaperdollItems())
-				{
-					if (item.getId() == _itemId)
-					{
-						return true;
-					}
-				}
-				return false;
+				return caster.getInventory().isItemEquipped(_itemId);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : target.getActingPlayer().getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							return true;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId);
 			}
 			case BOTH:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : caster.getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							for (Item i : target.getActingPlayer().getInventory().getPaperdollItems())
-							{
-								if (i.getId() == _itemId)
-								{
-									return true;
-								}
-							}
-							return false;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId) && caster.getInventory().isItemEquipped(_itemId);
 			}
 		}
 		return false;
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
index 091b7c27b7..61abadc33c 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
@@ -20,7 +20,6 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
@@ -45,49 +44,15 @@ public class OpEquipItemSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				for (Item item : caster.getInventory().getPaperdollItems())
-				{
-					if (item.getId() == _itemId)
-					{
-						return true;
-					}
-				}
-				return false;
+				return caster.getInventory().isItemEquipped(_itemId);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : target.getActingPlayer().getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							return true;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId);
 			}
 			case BOTH:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : caster.getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							for (Item i : target.getActingPlayer().getInventory().getPaperdollItems())
-							{
-								if (i.getId() == _itemId)
-								{
-									return true;
-								}
-							}
-							return false;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId) && caster.getInventory().isItemEquipped(_itemId);
 			}
 		}
 		return false;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
index 091b7c27b7..61abadc33c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
@@ -20,7 +20,6 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
@@ -45,49 +44,15 @@ public class OpEquipItemSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				for (Item item : caster.getInventory().getPaperdollItems())
-				{
-					if (item.getId() == _itemId)
-					{
-						return true;
-					}
-				}
-				return false;
+				return caster.getInventory().isItemEquipped(_itemId);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : target.getActingPlayer().getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							return true;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId);
 			}
 			case BOTH:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : caster.getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							for (Item i : target.getActingPlayer().getInventory().getPaperdollItems())
-							{
-								if (i.getId() == _itemId)
-								{
-									return true;
-								}
-							}
-							return false;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId) && caster.getInventory().isItemEquipped(_itemId);
 			}
 		}
 		return false;
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
index 091b7c27b7..61abadc33c 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
@@ -20,7 +20,6 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
@@ -45,49 +44,15 @@ public class OpEquipItemSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				for (Item item : caster.getInventory().getPaperdollItems())
-				{
-					if (item.getId() == _itemId)
-					{
-						return true;
-					}
-				}
-				return false;
+				return caster.getInventory().isItemEquipped(_itemId);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : target.getActingPlayer().getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							return true;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId);
 			}
 			case BOTH:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : caster.getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							for (Item i : target.getActingPlayer().getInventory().getPaperdollItems())
-							{
-								if (i.getId() == _itemId)
-								{
-									return true;
-								}
-							}
-							return false;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId) && caster.getInventory().isItemEquipped(_itemId);
 			}
 		}
 		return false;
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
index 091b7c27b7..61abadc33c 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
@@ -20,7 +20,6 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
@@ -45,49 +44,15 @@ public class OpEquipItemSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				for (Item item : caster.getInventory().getPaperdollItems())
-				{
-					if (item.getId() == _itemId)
-					{
-						return true;
-					}
-				}
-				return false;
+				return caster.getInventory().isItemEquipped(_itemId);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : target.getActingPlayer().getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							return true;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId);
 			}
 			case BOTH:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : caster.getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							for (Item i : target.getActingPlayer().getInventory().getPaperdollItems())
-							{
-								if (i.getId() == _itemId)
-								{
-									return true;
-								}
-							}
-							return false;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId) && caster.getInventory().isItemEquipped(_itemId);
 			}
 		}
 		return false;
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
index 091b7c27b7..61abadc33c 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
@@ -20,7 +20,6 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
@@ -45,49 +44,15 @@ public class OpEquipItemSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				for (Item item : caster.getInventory().getPaperdollItems())
-				{
-					if (item.getId() == _itemId)
-					{
-						return true;
-					}
-				}
-				return false;
+				return caster.getInventory().isItemEquipped(_itemId);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : target.getActingPlayer().getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							return true;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId);
 			}
 			case BOTH:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : caster.getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							for (Item i : target.getActingPlayer().getInventory().getPaperdollItems())
-							{
-								if (i.getId() == _itemId)
-								{
-									return true;
-								}
-							}
-							return false;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId) && caster.getInventory().isItemEquipped(_itemId);
 			}
 		}
 		return false;
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
index 091b7c27b7..61abadc33c 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
@@ -20,7 +20,6 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
@@ -45,49 +44,15 @@ public class OpEquipItemSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				for (Item item : caster.getInventory().getPaperdollItems())
-				{
-					if (item.getId() == _itemId)
-					{
-						return true;
-					}
-				}
-				return false;
+				return caster.getInventory().isItemEquipped(_itemId);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : target.getActingPlayer().getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							return true;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId);
 			}
 			case BOTH:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : caster.getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							for (Item i : target.getActingPlayer().getInventory().getPaperdollItems())
-							{
-								if (i.getId() == _itemId)
-								{
-									return true;
-								}
-							}
-							return false;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId) && caster.getInventory().isItemEquipped(_itemId);
 			}
 		}
 		return false;
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
index 091b7c27b7..61abadc33c 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
@@ -20,7 +20,6 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
@@ -45,49 +44,15 @@ public class OpEquipItemSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				for (Item item : caster.getInventory().getPaperdollItems())
-				{
-					if (item.getId() == _itemId)
-					{
-						return true;
-					}
-				}
-				return false;
+				return caster.getInventory().isItemEquipped(_itemId);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : target.getActingPlayer().getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							return true;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId);
 			}
 			case BOTH:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : caster.getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							for (Item i : target.getActingPlayer().getInventory().getPaperdollItems())
-							{
-								if (i.getId() == _itemId)
-								{
-									return true;
-								}
-							}
-							return false;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId) && caster.getInventory().isItemEquipped(_itemId);
 			}
 		}
 		return false;
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
index 091b7c27b7..61abadc33c 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
@@ -20,7 +20,6 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
@@ -45,49 +44,15 @@ public class OpEquipItemSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				for (Item item : caster.getInventory().getPaperdollItems())
-				{
-					if (item.getId() == _itemId)
-					{
-						return true;
-					}
-				}
-				return false;
+				return caster.getInventory().isItemEquipped(_itemId);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : target.getActingPlayer().getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							return true;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId);
 			}
 			case BOTH:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : caster.getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							for (Item i : target.getActingPlayer().getInventory().getPaperdollItems())
-							{
-								if (i.getId() == _itemId)
-								{
-									return true;
-								}
-							}
-							return false;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId) && caster.getInventory().isItemEquipped(_itemId);
 			}
 		}
 		return false;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
index 091b7c27b7..61abadc33c 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
@@ -20,7 +20,6 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
@@ -45,49 +44,15 @@ public class OpEquipItemSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				for (Item item : caster.getInventory().getPaperdollItems())
-				{
-					if (item.getId() == _itemId)
-					{
-						return true;
-					}
-				}
-				return false;
+				return caster.getInventory().isItemEquipped(_itemId);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : target.getActingPlayer().getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							return true;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId);
 			}
 			case BOTH:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : caster.getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							for (Item i : target.getActingPlayer().getInventory().getPaperdollItems())
-							{
-								if (i.getId() == _itemId)
-								{
-									return true;
-								}
-							}
-							return false;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId) && caster.getInventory().isItemEquipped(_itemId);
 			}
 		}
 		return false;
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
index 091b7c27b7..61abadc33c 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
@@ -20,7 +20,6 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
@@ -45,49 +44,15 @@ public class OpEquipItemSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				for (Item item : caster.getInventory().getPaperdollItems())
-				{
-					if (item.getId() == _itemId)
-					{
-						return true;
-					}
-				}
-				return false;
+				return caster.getInventory().isItemEquipped(_itemId);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : target.getActingPlayer().getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							return true;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId);
 			}
 			case BOTH:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : caster.getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							for (Item i : target.getActingPlayer().getInventory().getPaperdollItems())
-							{
-								if (i.getId() == _itemId)
-								{
-									return true;
-								}
-							}
-							return false;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId) && caster.getInventory().isItemEquipped(_itemId);
 			}
 		}
 		return false;
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
index 091b7c27b7..61abadc33c 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
@@ -20,7 +20,6 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
@@ -45,49 +44,15 @@ public class OpEquipItemSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				for (Item item : caster.getInventory().getPaperdollItems())
-				{
-					if (item.getId() == _itemId)
-					{
-						return true;
-					}
-				}
-				return false;
+				return caster.getInventory().isItemEquipped(_itemId);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : target.getActingPlayer().getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							return true;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId);
 			}
 			case BOTH:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : caster.getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							for (Item i : target.getActingPlayer().getInventory().getPaperdollItems())
-							{
-								if (i.getId() == _itemId)
-								{
-									return true;
-								}
-							}
-							return false;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId) && caster.getInventory().isItemEquipped(_itemId);
 			}
 		}
 		return false;
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
index 091b7c27b7..61abadc33c 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java
@@ -20,7 +20,6 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
@@ -45,49 +44,15 @@ public class OpEquipItemSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				for (Item item : caster.getInventory().getPaperdollItems())
-				{
-					if (item.getId() == _itemId)
-					{
-						return true;
-					}
-				}
-				return false;
+				return caster.getInventory().isItemEquipped(_itemId);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : target.getActingPlayer().getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							return true;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId);
 			}
 			case BOTH:
 			{
-				if ((target != null) && target.isPlayer())
-				{
-					for (Item item : caster.getInventory().getPaperdollItems())
-					{
-						if (item.getId() == _itemId)
-						{
-							for (Item i : target.getActingPlayer().getInventory().getPaperdollItems())
-							{
-								if (i.getId() == _itemId)
-								{
-									return true;
-								}
-							}
-							return false;
-						}
-					}
-				}
-				return false;
+				return (target != null) && target.isPlayer() && target.getActingPlayer().getInventory().isItemEquipped(_itemId) && caster.getInventory().isItemEquipped(_itemId);
 			}
 		}
 		return false;