Improved Inventory isItemEquipped method.

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

View File

@ -993,9 +993,9 @@ public abstract class Inventory extends ItemContainer
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;
}

View File

@ -999,9 +999,9 @@ public abstract class Inventory extends ItemContainer
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;
}

View File

@ -999,9 +999,9 @@ public abstract class Inventory extends ItemContainer
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;
}

View File

@ -999,9 +999,9 @@ public abstract class Inventory extends ItemContainer
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;
}

View File

@ -1033,9 +1033,9 @@ public abstract class Inventory extends ItemContainer
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;
}

View File

@ -1101,9 +1101,9 @@ public abstract class Inventory extends ItemContainer
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;
}

View File

@ -1101,9 +1101,9 @@ public abstract class Inventory extends ItemContainer
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;
}

View File

@ -1094,9 +1094,9 @@ public abstract class Inventory extends ItemContainer
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;
}

View File

@ -1094,9 +1094,9 @@ public abstract class Inventory extends ItemContainer
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;
}

View File

@ -999,9 +999,9 @@ public abstract class Inventory extends ItemContainer
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;
}

View File

@ -999,9 +999,9 @@ public abstract class Inventory extends ItemContainer
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;
}

View File

@ -1033,9 +1033,9 @@ public abstract class Inventory extends ItemContainer
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;
}

View File

@ -1101,9 +1101,9 @@ public abstract class Inventory extends ItemContainer
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;
}

View File

@ -1101,9 +1101,9 @@ public abstract class Inventory extends ItemContainer
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;
}

View File

@ -1094,9 +1094,9 @@ public abstract class Inventory extends ItemContainer
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;
}

View File

@ -993,9 +993,9 @@ public abstract class Inventory extends ItemContainer
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;
}

View File

@ -1094,9 +1094,9 @@ public abstract class Inventory extends ItemContainer
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;
}