From 5d6ab988b86a8c97cbafdd8be7993ea905cfd88c Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 31 Oct 2020 14:33:39 +0000 Subject: [PATCH] Re-written OpEquipItemSkillCondition. --- .../OpEquipItemSkillCondition.java | 38 ++++++++++++++++--- .../OpEquipItemSkillCondition.java | 38 ++++++++++++++++--- .../OpEquipItemSkillCondition.java | 38 ++++++++++++++++--- .../OpEquipItemSkillCondition.java | 38 ++++++++++++++++--- .../OpEquipItemSkillCondition.java | 38 ++++++++++++++++--- .../OpEquipItemSkillCondition.java | 38 ++++++++++++++++--- .../OpEquipItemSkillCondition.java | 38 ++++++++++++++++--- .../OpEquipItemSkillCondition.java | 38 ++++++++++++++++--- .../OpEquipItemSkillCondition.java | 38 ++++++++++++++++--- .../OpEquipItemSkillCondition.java | 38 ++++++++++++++++--- .../OpEquipItemSkillCondition.java | 38 ++++++++++++++++--- .../OpEquipItemSkillCondition.java | 38 ++++++++++++++++--- .../OpEquipItemSkillCondition.java | 38 ++++++++++++++++--- .../OpEquipItemSkillCondition.java | 38 ++++++++++++++++--- .../OpEquipItemSkillCondition.java | 38 ++++++++++++++++--- .../OpEquipItemSkillCondition.java | 38 ++++++++++++++++--- .../OpEquipItemSkillCondition.java | 38 ++++++++++++++++--- 17 files changed, 544 insertions(+), 102 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 101a891f1f..e01352694e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; /** - * @author Sdw + * @author Mobius */ public class OpEquipItemSkillCondition implements ISkillCondition { @@ -45,23 +45,49 @@ public class OpEquipItemSkillCondition implements ISkillCondition { case CASTER: { - return !caster.getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : caster.getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + return true; + } + } + return false; } case TARGET: { if ((target != null) && target.isPlayer()) { - return !target.getActingPlayer().getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : target.getActingPlayer().getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + return true; + } + } } - break; + return false; } case BOTH: { if ((target != null) && target.isPlayer()) { - return !caster.getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty() && target.getActingPlayer().getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : caster.getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + for (ItemInstance i : target.getActingPlayer().getInventory().getPaperdollItems()) + { + if (i.getId() == _itemId) + { + return true; + } + } + return false; + } + } } - break; + return false; } } return false; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 101a891f1f..e01352694e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; /** - * @author Sdw + * @author Mobius */ public class OpEquipItemSkillCondition implements ISkillCondition { @@ -45,23 +45,49 @@ public class OpEquipItemSkillCondition implements ISkillCondition { case CASTER: { - return !caster.getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : caster.getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + return true; + } + } + return false; } case TARGET: { if ((target != null) && target.isPlayer()) { - return !target.getActingPlayer().getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : target.getActingPlayer().getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + return true; + } + } } - break; + return false; } case BOTH: { if ((target != null) && target.isPlayer()) { - return !caster.getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty() && target.getActingPlayer().getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : caster.getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + for (ItemInstance i : target.getActingPlayer().getInventory().getPaperdollItems()) + { + if (i.getId() == _itemId) + { + return true; + } + } + return false; + } + } } - break; + return false; } } return false; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 101a891f1f..e01352694e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; /** - * @author Sdw + * @author Mobius */ public class OpEquipItemSkillCondition implements ISkillCondition { @@ -45,23 +45,49 @@ public class OpEquipItemSkillCondition implements ISkillCondition { case CASTER: { - return !caster.getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : caster.getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + return true; + } + } + return false; } case TARGET: { if ((target != null) && target.isPlayer()) { - return !target.getActingPlayer().getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : target.getActingPlayer().getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + return true; + } + } } - break; + return false; } case BOTH: { if ((target != null) && target.isPlayer()) { - return !caster.getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty() && target.getActingPlayer().getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : caster.getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + for (ItemInstance i : target.getActingPlayer().getInventory().getPaperdollItems()) + { + if (i.getId() == _itemId) + { + return true; + } + } + return false; + } + } } - break; + return false; } } return false; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 101a891f1f..e01352694e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; /** - * @author Sdw + * @author Mobius */ public class OpEquipItemSkillCondition implements ISkillCondition { @@ -45,23 +45,49 @@ public class OpEquipItemSkillCondition implements ISkillCondition { case CASTER: { - return !caster.getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : caster.getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + return true; + } + } + return false; } case TARGET: { if ((target != null) && target.isPlayer()) { - return !target.getActingPlayer().getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : target.getActingPlayer().getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + return true; + } + } } - break; + return false; } case BOTH: { if ((target != null) && target.isPlayer()) { - return !caster.getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty() && target.getActingPlayer().getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : caster.getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + for (ItemInstance i : target.getActingPlayer().getInventory().getPaperdollItems()) + { + if (i.getId() == _itemId) + { + return true; + } + } + return false; + } + } } - break; + return false; } } return false; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 101a891f1f..e01352694e 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; /** - * @author Sdw + * @author Mobius */ public class OpEquipItemSkillCondition implements ISkillCondition { @@ -45,23 +45,49 @@ public class OpEquipItemSkillCondition implements ISkillCondition { case CASTER: { - return !caster.getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : caster.getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + return true; + } + } + return false; } case TARGET: { if ((target != null) && target.isPlayer()) { - return !target.getActingPlayer().getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : target.getActingPlayer().getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + return true; + } + } } - break; + return false; } case BOTH: { if ((target != null) && target.isPlayer()) { - return !caster.getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty() && target.getActingPlayer().getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : caster.getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + for (ItemInstance i : target.getActingPlayer().getInventory().getPaperdollItems()) + { + if (i.getId() == _itemId) + { + return true; + } + } + return false; + } + } } - break; + return false; } } return false; diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 101a891f1f..e01352694e 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; /** - * @author Sdw + * @author Mobius */ public class OpEquipItemSkillCondition implements ISkillCondition { @@ -45,23 +45,49 @@ public class OpEquipItemSkillCondition implements ISkillCondition { case CASTER: { - return !caster.getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : caster.getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + return true; + } + } + return false; } case TARGET: { if ((target != null) && target.isPlayer()) { - return !target.getActingPlayer().getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : target.getActingPlayer().getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + return true; + } + } } - break; + return false; } case BOTH: { if ((target != null) && target.isPlayer()) { - return !caster.getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty() && target.getActingPlayer().getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : caster.getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + for (ItemInstance i : target.getActingPlayer().getInventory().getPaperdollItems()) + { + if (i.getId() == _itemId) + { + return true; + } + } + return false; + } + } } - break; + return false; } } return false; diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 101a891f1f..e01352694e 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; /** - * @author Sdw + * @author Mobius */ public class OpEquipItemSkillCondition implements ISkillCondition { @@ -45,23 +45,49 @@ public class OpEquipItemSkillCondition implements ISkillCondition { case CASTER: { - return !caster.getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : caster.getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + return true; + } + } + return false; } case TARGET: { if ((target != null) && target.isPlayer()) { - return !target.getActingPlayer().getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : target.getActingPlayer().getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + return true; + } + } } - break; + return false; } case BOTH: { if ((target != null) && target.isPlayer()) { - return !caster.getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty() && target.getActingPlayer().getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : caster.getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + for (ItemInstance i : target.getActingPlayer().getInventory().getPaperdollItems()) + { + if (i.getId() == _itemId) + { + return true; + } + } + return false; + } + } } - break; + return false; } } return false; diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 101a891f1f..e01352694e 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; /** - * @author Sdw + * @author Mobius */ public class OpEquipItemSkillCondition implements ISkillCondition { @@ -45,23 +45,49 @@ public class OpEquipItemSkillCondition implements ISkillCondition { case CASTER: { - return !caster.getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : caster.getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + return true; + } + } + return false; } case TARGET: { if ((target != null) && target.isPlayer()) { - return !target.getActingPlayer().getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : target.getActingPlayer().getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + return true; + } + } } - break; + return false; } case BOTH: { if ((target != null) && target.isPlayer()) { - return !caster.getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty() && target.getActingPlayer().getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : caster.getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + for (ItemInstance i : target.getActingPlayer().getInventory().getPaperdollItems()) + { + if (i.getId() == _itemId) + { + return true; + } + } + return false; + } + } } - break; + return false; } } return false; diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 101a891f1f..e01352694e 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; /** - * @author Sdw + * @author Mobius */ public class OpEquipItemSkillCondition implements ISkillCondition { @@ -45,23 +45,49 @@ public class OpEquipItemSkillCondition implements ISkillCondition { case CASTER: { - return !caster.getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : caster.getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + return true; + } + } + return false; } case TARGET: { if ((target != null) && target.isPlayer()) { - return !target.getActingPlayer().getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : target.getActingPlayer().getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + return true; + } + } } - break; + return false; } case BOTH: { if ((target != null) && target.isPlayer()) { - return !caster.getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty() && target.getActingPlayer().getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : caster.getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + for (ItemInstance i : target.getActingPlayer().getInventory().getPaperdollItems()) + { + if (i.getId() == _itemId) + { + return true; + } + } + return false; + } + } } - break; + return false; } } 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 101a891f1f..e01352694e 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 @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; /** - * @author Sdw + * @author Mobius */ public class OpEquipItemSkillCondition implements ISkillCondition { @@ -45,23 +45,49 @@ public class OpEquipItemSkillCondition implements ISkillCondition { case CASTER: { - return !caster.getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : caster.getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + return true; + } + } + return false; } case TARGET: { if ((target != null) && target.isPlayer()) { - return !target.getActingPlayer().getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : target.getActingPlayer().getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + return true; + } + } } - break; + return false; } case BOTH: { if ((target != null) && target.isPlayer()) { - return !caster.getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty() && target.getActingPlayer().getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : caster.getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + for (ItemInstance i : target.getActingPlayer().getInventory().getPaperdollItems()) + { + if (i.getId() == _itemId) + { + return true; + } + } + return false; + } + } } - break; + return false; } } return false; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 101a891f1f..e01352694e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; /** - * @author Sdw + * @author Mobius */ public class OpEquipItemSkillCondition implements ISkillCondition { @@ -45,23 +45,49 @@ public class OpEquipItemSkillCondition implements ISkillCondition { case CASTER: { - return !caster.getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : caster.getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + return true; + } + } + return false; } case TARGET: { if ((target != null) && target.isPlayer()) { - return !target.getActingPlayer().getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : target.getActingPlayer().getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + return true; + } + } } - break; + return false; } case BOTH: { if ((target != null) && target.isPlayer()) { - return !caster.getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty() && target.getActingPlayer().getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : caster.getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + for (ItemInstance i : target.getActingPlayer().getInventory().getPaperdollItems()) + { + if (i.getId() == _itemId) + { + return true; + } + } + return false; + } + } } - break; + return false; } } return false; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 101a891f1f..e01352694e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; /** - * @author Sdw + * @author Mobius */ public class OpEquipItemSkillCondition implements ISkillCondition { @@ -45,23 +45,49 @@ public class OpEquipItemSkillCondition implements ISkillCondition { case CASTER: { - return !caster.getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : caster.getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + return true; + } + } + return false; } case TARGET: { if ((target != null) && target.isPlayer()) { - return !target.getActingPlayer().getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : target.getActingPlayer().getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + return true; + } + } } - break; + return false; } case BOTH: { if ((target != null) && target.isPlayer()) { - return !caster.getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty() && target.getActingPlayer().getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : caster.getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + for (ItemInstance i : target.getActingPlayer().getInventory().getPaperdollItems()) + { + if (i.getId() == _itemId) + { + return true; + } + } + return false; + } + } } - break; + return false; } } return false; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 101a891f1f..e01352694e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; /** - * @author Sdw + * @author Mobius */ public class OpEquipItemSkillCondition implements ISkillCondition { @@ -45,23 +45,49 @@ public class OpEquipItemSkillCondition implements ISkillCondition { case CASTER: { - return !caster.getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : caster.getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + return true; + } + } + return false; } case TARGET: { if ((target != null) && target.isPlayer()) { - return !target.getActingPlayer().getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : target.getActingPlayer().getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + return true; + } + } } - break; + return false; } case BOTH: { if ((target != null) && target.isPlayer()) { - return !caster.getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty() && target.getActingPlayer().getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : caster.getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + for (ItemInstance i : target.getActingPlayer().getInventory().getPaperdollItems()) + { + if (i.getId() == _itemId) + { + return true; + } + } + return false; + } + } } - break; + return false; } } return false; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 101a891f1f..e01352694e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; /** - * @author Sdw + * @author Mobius */ public class OpEquipItemSkillCondition implements ISkillCondition { @@ -45,23 +45,49 @@ public class OpEquipItemSkillCondition implements ISkillCondition { case CASTER: { - return !caster.getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : caster.getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + return true; + } + } + return false; } case TARGET: { if ((target != null) && target.isPlayer()) { - return !target.getActingPlayer().getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : target.getActingPlayer().getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + return true; + } + } } - break; + return false; } case BOTH: { if ((target != null) && target.isPlayer()) { - return !caster.getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty() && target.getActingPlayer().getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : caster.getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + for (ItemInstance i : target.getActingPlayer().getInventory().getPaperdollItems()) + { + if (i.getId() == _itemId) + { + return true; + } + } + return false; + } + } } - break; + return false; } } 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 101a891f1f..e01352694e 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 @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; /** - * @author Sdw + * @author Mobius */ public class OpEquipItemSkillCondition implements ISkillCondition { @@ -45,23 +45,49 @@ public class OpEquipItemSkillCondition implements ISkillCondition { case CASTER: { - return !caster.getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : caster.getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + return true; + } + } + return false; } case TARGET: { if ((target != null) && target.isPlayer()) { - return !target.getActingPlayer().getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : target.getActingPlayer().getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + return true; + } + } } - break; + return false; } case BOTH: { if ((target != null) && target.isPlayer()) { - return !caster.getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty() && target.getActingPlayer().getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : caster.getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + for (ItemInstance i : target.getActingPlayer().getInventory().getPaperdollItems()) + { + if (i.getId() == _itemId) + { + return true; + } + } + return false; + } + } } - break; + return false; } } 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 101a891f1f..e01352694e 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 @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; /** - * @author Sdw + * @author Mobius */ public class OpEquipItemSkillCondition implements ISkillCondition { @@ -45,23 +45,49 @@ public class OpEquipItemSkillCondition implements ISkillCondition { case CASTER: { - return !caster.getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : caster.getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + return true; + } + } + return false; } case TARGET: { if ((target != null) && target.isPlayer()) { - return !target.getActingPlayer().getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : target.getActingPlayer().getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + return true; + } + } } - break; + return false; } case BOTH: { if ((target != null) && target.isPlayer()) { - return !caster.getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty() && target.getActingPlayer().getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : caster.getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + for (ItemInstance i : target.getActingPlayer().getInventory().getPaperdollItems()) + { + if (i.getId() == _itemId) + { + return true; + } + } + return false; + } + } } - break; + return false; } } return false; diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 101a891f1f..e01352694e 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; /** - * @author Sdw + * @author Mobius */ public class OpEquipItemSkillCondition implements ISkillCondition { @@ -45,23 +45,49 @@ public class OpEquipItemSkillCondition implements ISkillCondition { case CASTER: { - return !caster.getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : caster.getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + return true; + } + } + return false; } case TARGET: { if ((target != null) && target.isPlayer()) { - return !target.getActingPlayer().getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : target.getActingPlayer().getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + return true; + } + } } - break; + return false; } case BOTH: { if ((target != null) && target.isPlayer()) { - return !caster.getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty() && target.getActingPlayer().getInventory().getItems(ItemInstance::isEquipped, i -> i.getId() == _itemId).isEmpty(); + for (ItemInstance item : caster.getInventory().getPaperdollItems()) + { + if (item.getId() == _itemId) + { + for (ItemInstance i : target.getActingPlayer().getInventory().getPaperdollItems()) + { + if (i.getId() == _itemId) + { + return true; + } + } + return false; + } + } } - break; + return false; } } return false;