lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OpEquipItem skill condition cleanup.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-09-03 01:40:30 +00:00
parent 40ebd82319
commit ed9095b11a
24 changed files with 72 additions and 912 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java vendored
View File

@@ -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;