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

Proper method name for returning item location.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-07-30 18:33:27 +00:00
parent 9f4153fdd9
commit 00a2f0e962
9 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java
View File

@@ -498,7 +498,7 @@ public class CreatureAI extends AbstractAI
return; return;
} }
if ((object instanceof ItemInstance) && (((ItemInstance) object).getLocation() != ItemLocation.VOID)) if ((object instanceof ItemInstance) && (((ItemInstance) object).getItemLocation() != ItemLocation.VOID))
{ {
// Cancel action client side by sending Server->Client packet ActionFailed to the PlayerInstance actor // Cancel action client side by sending Server->Client packet ActionFailed to the PlayerInstance actor
clientActionFailed(); clientActionFailed();

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCreateItem.java
View File

@@ -292,7 +292,7 @@ public class AdminCreateItem implements IAdminCommandHandler
{ {
for (ItemInstance item : activeChar.getInventory().getItems()) for (ItemInstance item : activeChar.getInventory().getItems())
{ {
if (item.getLocation() == ItemInstance.ItemLocation.INVENTORY) if (item.getItemLocation() == ItemInstance.ItemLocation.INVENTORY)
{ {
activeChar.getInventory().destroyItem("Destroy", item.getObjectId(), item.getCount(), activeChar, null); activeChar.getInventory().destroyItem("Destroy", item.getObjectId(), item.getCount(), activeChar, null);
} }

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SummonItems.java
View File

@@ -245,7 +245,7 @@ public class SummonItems implements IItemHandler
_player.sendPacket(new MagicSkillLaunched(_player, 2046, 1)); _player.sendPacket(new MagicSkillLaunched(_player, 2046, 1));
// check for summon item validity // check for summon item validity
if ((_item == null) || (_item.getOwnerId() != _player.getObjectId()) || (_item.getLocation() != ItemInstance.ItemLocation.INVENTORY)) if ((_item == null) || (_item.getOwnerId() != _player.getObjectId()) || (_item.getItemLocation() != ItemInstance.ItemLocation.INVENTORY))
{ {
return; return;
} }

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/PlayerFreight.java
View File

@@ -123,7 +123,7 @@ public class PlayerFreight extends ItemContainer
super.addItem(item); super.addItem(item);
if (_activeLocationId > 0) if (_activeLocationId > 0)
{ {
item.setLocation(item.getLocation(), _activeLocationId); item.setLocation(item.getItemLocation(), _activeLocationId);
} }
} }

10
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ItemInstance.java
View File

@@ -214,10 +214,10 @@ public final class ItemInstance extends WorldObject
} }
/** /**
* Gets the location. * Gets the item location.
* @return the location * @return the item location
*/ */
public ItemLocation getLocation() public ItemLocation getItemLocation()
{ {
return _loc; return _loc;
} }
@@ -1080,7 +1080,7 @@ public final class ItemInstance extends WorldObject
inst._mana = manaLeft; inst._mana = manaLeft;
// consume 1 mana // consume 1 mana
if ((inst._mana > 0) && (inst.getLocation() == ItemLocation.PAPERDOLL)) if ((inst._mana > 0) && (inst.getItemLocation() == ItemLocation.PAPERDOLL))
{ {
inst.decreaseMana(false); inst.decreaseMana(false);
} }
@@ -1096,7 +1096,7 @@ public final class ItemInstance extends WorldObject
return null; return null;
} }
else if ((inst._mana > 0) && (inst.getLocation() == ItemLocation.PAPERDOLL)) else if ((inst._mana > 0) && (inst.getItemLocation() == ItemLocation.PAPERDOLL))
{ {
inst.scheduleConsumeManaTask(); inst.scheduleConsumeManaTask();
} }

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
View File

@@ -339,7 +339,7 @@ public class PetInstance extends Summon
{ {
for (ItemInstance item : _inventory.getItems()) for (ItemInstance item : _inventory.getItems())
{ {
if ((item.getLocation() == ItemInstance.ItemLocation.PET_EQUIP) && (item.getItem().getBodyPart() == Item.SLOT_R_HAND)) if ((item.getItemLocation() == ItemInstance.ItemLocation.PET_EQUIP) && (item.getItem().getBodyPart() == Item.SLOT_R_HAND))
{ {
return item; return item;
} }

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
View File

@@ -630,7 +630,7 @@ public final class RequestEnchantItem extends GameClientPacket
return; return;
} }
if ((item.getLocation() != ItemInstance.ItemLocation.INVENTORY) && (item.getLocation() != ItemInstance.ItemLocation.PAPERDOLL)) if ((item.getItemLocation() != ItemInstance.ItemLocation.INVENTORY) && (item.getItemLocation() != ItemInstance.ItemLocation.PAPERDOLL))
{ {
player.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITION); player.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITION);
return; return;

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/thread/daemons/ItemsAutoDestroy.java
View File

@@ -72,7 +72,7 @@ public class ItemsAutoDestroy
for (ItemInstance item : _items) for (ItemInstance item : _items)
{ {
if ((item == null) || (item.getDropTime() == 0) || (item.getLocation() != ItemInstance.ItemLocation.VOID)) if ((item == null) || (item.getDropTime() == 0) || (item.getItemLocation() != ItemInstance.ItemLocation.VOID))
{ {
_items.remove(item); _items.remove(item);
} }

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/status/GameStatusThread.java
View File

@@ -1046,7 +1046,7 @@ public class GameStatusThread extends Thread
} }
if (obj instanceof ItemInstance) if (obj instanceof ItemInstance)
{ {
if (((ItemInstance) obj).getLocation() == ItemInstance.ItemLocation.VOID) if (((ItemInstance) obj).getItemLocation() == ItemInstance.ItemLocation.VOID)
{ {
itemVoidCount++; itemVoidCount++;
} }