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

Improved Inventory isItemEquipped method.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-10-31 14:42:30 +00:00
parent 5d6ab988b8
commit 2f0b8b37e5
17 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -993,9 +993,9 @@ public abstract class Inventory extends ItemContainer
public boolean isItemEquipped(int itemId) public boolean isItemEquipped(int itemId)
{ {
for (ItemInstance item : getItemsByItemId(itemId)) for (ItemInstance item : _paperdoll)
{ {
if (item.isEquipped()) if ((item != null) && (item.getId() == itemId))
{ {
return true; return true;
} }

4
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -999,9 +999,9 @@ public abstract class Inventory extends ItemContainer
public boolean isItemEquipped(int itemId) public boolean isItemEquipped(int itemId)
{ {
for (ItemInstance item : getItemsByItemId(itemId)) for (ItemInstance item : _paperdoll)
{ {
if (item.isEquipped()) if ((item != null) && (item.getId() == itemId))
{ {
return true; return true;
} }

4
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -999,9 +999,9 @@ public abstract class Inventory extends ItemContainer
public boolean isItemEquipped(int itemId) public boolean isItemEquipped(int itemId)
{ {
for (ItemInstance item : getItemsByItemId(itemId)) for (ItemInstance item : _paperdoll)
{ {
if (item.isEquipped()) if ((item != null) && (item.getId() == itemId))
{ {
return true; return true;
} }

4
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -999,9 +999,9 @@ public abstract class Inventory extends ItemContainer
public boolean isItemEquipped(int itemId) public boolean isItemEquipped(int itemId)
{ {
for (ItemInstance item : getItemsByItemId(itemId)) for (ItemInstance item : _paperdoll)
{ {
if (item.isEquipped()) if ((item != null) && (item.getId() == itemId))
{ {
return true; return true;
} }

4
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -1033,9 +1033,9 @@ public abstract class Inventory extends ItemContainer
public boolean isItemEquipped(int itemId) public boolean isItemEquipped(int itemId)
{ {
for (ItemInstance item : getItemsByItemId(itemId)) for (ItemInstance item : _paperdoll)
{ {
if (item.isEquipped()) if ((item != null) && (item.getId() == itemId))
{ {
return true; return true;
} }

4
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -1101,9 +1101,9 @@ public abstract class Inventory extends ItemContainer
public boolean isItemEquipped(int itemId) public boolean isItemEquipped(int itemId)
{ {
for (ItemInstance item : getItemsByItemId(itemId)) for (ItemInstance item : _paperdoll)
{ {
if (item.isEquipped()) if ((item != null) && (item.getId() == itemId))
{ {
return true; return true;
} }

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -1101,9 +1101,9 @@ public abstract class Inventory extends ItemContainer
public boolean isItemEquipped(int itemId) public boolean isItemEquipped(int itemId)
{ {
for (ItemInstance item : getItemsByItemId(itemId)) for (ItemInstance item : _paperdoll)
{ {
if (item.isEquipped()) if ((item != null) && (item.getId() == itemId))
{ {
return true; return true;
} }

4
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -1094,9 +1094,9 @@ public abstract class Inventory extends ItemContainer
public boolean isItemEquipped(int itemId) public boolean isItemEquipped(int itemId)
{ {
for (ItemInstance item : getItemsByItemId(itemId)) for (ItemInstance item : _paperdoll)
{ {
if (item.isEquipped()) if ((item != null) && (item.getId() == itemId))
{ {
return true; return true;
} }

4
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -1094,9 +1094,9 @@ public abstract class Inventory extends ItemContainer
public boolean isItemEquipped(int itemId) public boolean isItemEquipped(int itemId)
{ {
for (ItemInstance item : getItemsByItemId(itemId)) for (ItemInstance item : _paperdoll)
{ {
if (item.isEquipped()) if ((item != null) && (item.getId() == itemId))
{ {
return true; return true;
} }

4
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -999,9 +999,9 @@ public abstract class Inventory extends ItemContainer
public boolean isItemEquipped(int itemId) public boolean isItemEquipped(int itemId)
{ {
for (ItemInstance item : getItemsByItemId(itemId)) for (ItemInstance item : _paperdoll)
{ {
if (item.isEquipped()) if ((item != null) && (item.getId() == itemId))
{ {
return true; return true;
} }

4
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -999,9 +999,9 @@ public abstract class Inventory extends ItemContainer
public boolean isItemEquipped(int itemId) public boolean isItemEquipped(int itemId)
{ {
for (ItemInstance item : getItemsByItemId(itemId)) for (ItemInstance item : _paperdoll)
{ {
if (item.isEquipped()) if ((item != null) && (item.getId() == itemId))
{ {
return true; return true;
} }

4
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -1033,9 +1033,9 @@ public abstract class Inventory extends ItemContainer
public boolean isItemEquipped(int itemId) public boolean isItemEquipped(int itemId)
{ {
for (ItemInstance item : getItemsByItemId(itemId)) for (ItemInstance item : _paperdoll)
{ {
if (item.isEquipped()) if ((item != null) && (item.getId() == itemId))
{ {
return true; return true;
} }

4
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -1101,9 +1101,9 @@ public abstract class Inventory extends ItemContainer
public boolean isItemEquipped(int itemId) public boolean isItemEquipped(int itemId)
{ {
for (ItemInstance item : getItemsByItemId(itemId)) for (ItemInstance item : _paperdoll)
{ {
if (item.isEquipped()) if ((item != null) && (item.getId() == itemId))
{ {
return true; return true;
} }

4
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -1101,9 +1101,9 @@ public abstract class Inventory extends ItemContainer
public boolean isItemEquipped(int itemId) public boolean isItemEquipped(int itemId)
{ {
for (ItemInstance item : getItemsByItemId(itemId)) for (ItemInstance item : _paperdoll)
{ {
if (item.isEquipped()) if ((item != null) && (item.getId() == itemId))
{ {
return true; return true;
} }

4
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -1094,9 +1094,9 @@ public abstract class Inventory extends ItemContainer
public boolean isItemEquipped(int itemId) public boolean isItemEquipped(int itemId)
{ {
for (ItemInstance item : getItemsByItemId(itemId)) for (ItemInstance item : _paperdoll)
{ {
if (item.isEquipped()) if ((item != null) && (item.getId() == itemId))
{ {
return true; return true;
} }

4
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -993,9 +993,9 @@ public abstract class Inventory extends ItemContainer
public boolean isItemEquipped(int itemId) public boolean isItemEquipped(int itemId)
{ {
for (ItemInstance item : getItemsByItemId(itemId)) for (ItemInstance item : _paperdoll)
{ {
if (item.isEquipped()) if ((item != null) && (item.getId() == itemId))
{ {
return true; return true;
} }

4
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -1094,9 +1094,9 @@ public abstract class Inventory extends ItemContainer
public boolean isItemEquipped(int itemId) public boolean isItemEquipped(int itemId)
{ {
for (ItemInstance item : getItemsByItemId(itemId)) for (ItemInstance item : _paperdoll)
{ {
if (item.isEquipped()) if ((item != null) && (item.getId() == itemId))
{ {
return true; return true;
} }