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

ConditionUsingItemType should check for ArmorType.NONE mask.

Browse Source
This commit is contained in:
MobiusDev 2019-02-20 07:47:07 +00:00
parent 7127a112ae
commit d817e4587b
10 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java
View File

@ -58,7 +58,7 @@ public final class ConditionUsingItemType extends Condition
final L2ItemInstance chest = inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST); final L2ItemInstance chest = inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST);
if (chest == null) if (chest == null)
{ {
return false; return (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask();
} }
final int chestMask = chest.getItem().getItemMask(); final int chestMask = chest.getItem().getItemMask();
@ -80,7 +80,7 @@ public final class ConditionUsingItemType extends Condition
final L2ItemInstance legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS); final L2ItemInstance legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS);
if (legs == null) if (legs == null)
{ {
return false; return (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask();
} }
final int legMask = legs.getItem().getItemMask(); final int legMask = legs.getItem().getItemMask();
// return true if legs armor matches too // return true if legs armor matches too

4
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java
View File

@ -58,7 +58,7 @@ public final class ConditionUsingItemType extends Condition
final L2ItemInstance chest = inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST); final L2ItemInstance chest = inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST);
if (chest == null) if (chest == null)
{ {
return false; return (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask();
} }
final int chestMask = chest.getItem().getItemMask(); final int chestMask = chest.getItem().getItemMask();
@ -80,7 +80,7 @@ public final class ConditionUsingItemType extends Condition
final L2ItemInstance legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS); final L2ItemInstance legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS);
if (legs == null) if (legs == null)
{ {
return false; return (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask();
} }
final int legMask = legs.getItem().getItemMask(); final int legMask = legs.getItem().getItemMask();
// return true if legs armor matches too // return true if legs armor matches too

4
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java
View File

@ -58,7 +58,7 @@ public final class ConditionUsingItemType extends Condition
final L2ItemInstance chest = inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST); final L2ItemInstance chest = inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST);
if (chest == null) if (chest == null)
{ {
return false; return (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask();
} }
final int chestMask = chest.getItem().getItemMask(); final int chestMask = chest.getItem().getItemMask();
@ -80,7 +80,7 @@ public final class ConditionUsingItemType extends Condition
final L2ItemInstance legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS); final L2ItemInstance legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS);
if (legs == null) if (legs == null)
{ {
return false; return (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask();
} }
final int legMask = legs.getItem().getItemMask(); final int legMask = legs.getItem().getItemMask();
// return true if legs armor matches too // return true if legs armor matches too

4
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java
View File

@ -58,7 +58,7 @@ public final class ConditionUsingItemType extends Condition
final L2ItemInstance chest = inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST); final L2ItemInstance chest = inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST);
if (chest == null) if (chest == null)
{ {
return false; return (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask();
} }
final int chestMask = chest.getItem().getItemMask(); final int chestMask = chest.getItem().getItemMask();
@ -80,7 +80,7 @@ public final class ConditionUsingItemType extends Condition
final L2ItemInstance legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS); final L2ItemInstance legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS);
if (legs == null) if (legs == null)
{ {
return false; return (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask();
} }
final int legMask = legs.getItem().getItemMask(); final int legMask = legs.getItem().getItemMask();
// return true if legs armor matches too // return true if legs armor matches too

4
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java
View File

@ -58,7 +58,7 @@ public final class ConditionUsingItemType extends Condition
final L2ItemInstance chest = inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST); final L2ItemInstance chest = inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST);
if (chest == null) if (chest == null)
{ {
return false; return (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask();
} }
final int chestMask = chest.getItem().getItemMask(); final int chestMask = chest.getItem().getItemMask();
@ -80,7 +80,7 @@ public final class ConditionUsingItemType extends Condition
final L2ItemInstance legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS); final L2ItemInstance legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS);
if (legs == null) if (legs == null)
{ {
return false; return (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask();
} }
final int legMask = legs.getItem().getItemMask(); final int legMask = legs.getItem().getItemMask();
// return true if legs armor matches too // return true if legs armor matches too

4
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java
View File

@ -58,7 +58,7 @@ public final class ConditionUsingItemType extends Condition
final L2ItemInstance chest = inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST); final L2ItemInstance chest = inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST);
if (chest == null) if (chest == null)
{ {
return false; return (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask();
} }
final int chestMask = chest.getItem().getItemMask(); final int chestMask = chest.getItem().getItemMask();
@ -80,7 +80,7 @@ public final class ConditionUsingItemType extends Condition
final L2ItemInstance legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS); final L2ItemInstance legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS);
if (legs == null) if (legs == null)
{ {
return false; return (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask();
} }
final int legMask = legs.getItem().getItemMask(); final int legMask = legs.getItem().getItemMask();
// return true if legs armor matches too // return true if legs armor matches too

4
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java
View File

@ -58,7 +58,7 @@ public final class ConditionUsingItemType extends Condition
final L2ItemInstance chest = inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST); final L2ItemInstance chest = inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST);
if (chest == null) if (chest == null)
{ {
return false; return (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask();
} }
final int chestMask = chest.getItem().getItemMask(); final int chestMask = chest.getItem().getItemMask();
@ -80,7 +80,7 @@ public final class ConditionUsingItemType extends Condition
final L2ItemInstance legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS); final L2ItemInstance legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS);
if (legs == null) if (legs == null)
{ {
return false; return (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask();
} }
final int legMask = legs.getItem().getItemMask(); final int legMask = legs.getItem().getItemMask();
// return true if legs armor matches too // return true if legs armor matches too

4
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java
View File

@ -58,7 +58,7 @@ public final class ConditionUsingItemType extends Condition
final L2ItemInstance chest = inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST); final L2ItemInstance chest = inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST);
if (chest == null) if (chest == null)
{ {
return false; return (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask();
} }
final int chestMask = chest.getItem().getItemMask(); final int chestMask = chest.getItem().getItemMask();
@ -80,7 +80,7 @@ public final class ConditionUsingItemType extends Condition
final L2ItemInstance legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS); final L2ItemInstance legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS);
if (legs == null) if (legs == null)
{ {
return false; return (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask();
} }
final int legMask = legs.getItem().getItemMask(); final int legMask = legs.getItem().getItemMask();
// return true if legs armor matches too // return true if legs armor matches too

4
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java
View File

@ -58,7 +58,7 @@ public final class ConditionUsingItemType extends Condition
final L2ItemInstance chest = inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST); final L2ItemInstance chest = inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST);
if (chest == null) if (chest == null)
{ {
return false; return (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask();
} }
final int chestMask = chest.getItem().getItemMask(); final int chestMask = chest.getItem().getItemMask();
@ -80,7 +80,7 @@ public final class ConditionUsingItemType extends Condition
final L2ItemInstance legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS); final L2ItemInstance legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS);
if (legs == null) if (legs == null)
{ {
return false; return (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask();
} }
final int legMask = legs.getItem().getItemMask(); final int legMask = legs.getItem().getItemMask();
// return true if legs armor matches too // return true if legs armor matches too

4
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java
View File

@ -58,7 +58,7 @@ public final class ConditionUsingItemType extends Condition
final L2ItemInstance chest = inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST); final L2ItemInstance chest = inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST);
if (chest == null) if (chest == null)
{ {
return false; return (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask();
} }
final int chestMask = chest.getItem().getItemMask(); final int chestMask = chest.getItem().getItemMask();
@ -80,7 +80,7 @@ public final class ConditionUsingItemType extends Condition
final L2ItemInstance legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS); final L2ItemInstance legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS);
if (legs == null) if (legs == null)
{ {
return false; return (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask();
} }
final int legMask = legs.getItem().getItemMask(); final int legMask = legs.getItem().getItemMask();
// return true if legs armor matches too // return true if legs armor matches too