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

Re-written OpEquipItemSkillCondition.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-10-31 14:33:39 +00:00
parent 793f4dee06
commit 5d6ab988b8
17 changed files with 544 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java vendored
View File

@@ -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;
}
break;
}
return false;
}
}
}
return false;
}
}
return false;

38
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java vendored
View File

@@ -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;
}
break;
}
return false;
}
}
}
return false;
}
}
return false;

38
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java vendored
View File

@@ -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;
}
break;
}
return false;
}
}
}
return false;
}
}
return false;

38
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java vendored
View File

@@ -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;
}
break;
}
return false;
}
}
}
return false;
}
}
return false;

38
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java vendored
View File

@@ -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;
}
break;
}
return false;
}
}
}
return false;
}
}
return false;

38
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java vendored
View File

@@ -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;
}
break;
}
return false;
}
}
}
return false;
}
}
return false;

38
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java vendored
View File

@@ -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;
}
break;
}
return false;
}
}
}
return false;
}
}
return false;

38
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java vendored
View File

@@ -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;
}
break;
}
return false;
}
}
}
return false;
}
}
return false;

38
L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java vendored
View File

@@ -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;
}
break;
}
return false;
}
}
}
return false;
}
}
return false;

38
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java vendored
View File

@@ -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;
}
break;
}
return false;
}
}
}
return false;
}
}
return false;

38
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java vendored
View File

@@ -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;
}
break;
}
return false;
}
}
}
return false;
}
}
return false;

38
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java vendored
View File

@@ -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;
}
break;
}
return false;
}
}
}
return false;
}
}
return false;

38
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java vendored
View File

@@ -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;
}
break;
}
return false;
}
}
}
return false;
}
}
return false;

38
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java vendored
View File

@@ -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;
}
break;
}
return false;
}
}
}
return false;
}
}
return false;

38
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java vendored
View File

@@ -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;
}
break;
}
return false;
}
}
}
return false;
}
}
return false;

38
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java vendored
View File

@@ -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;
}
break;
}
return false;
}
}
}
return false;
}
}
return false;

38
L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java vendored
View File

@@ -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;
}
break;
}
return false;
}
}
}
return false;
}
}
return false;