diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index b63e5b4dbd..47bf56026f 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -111,7 +111,7 @@ public class MultisellData return list; } - ItemInstance[] items; + List items; if (listTemplate.getMaintainEnchantment()) { items = player.getInventory().getUniqueItemsByEnchantLevel(false, false, false, true); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/events/CTF.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/events/CTF.java index 7158710dec..fe9b75633a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/events/CTF.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/events/CTF.java @@ -2869,10 +2869,9 @@ public class CTF implements EventTask player._haveFlagCTF = false; if (wpn != null) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); player.getInventory().destroyItemByItemId("", _FLAG_IN_HAND_ITEM_ID, 1, player, null); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance element : unequiped) + for (ItemInstance element : player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart())) { iu.addModifiedItem(element); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 0d4fbd8636..cc10d2fd28 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; -import java.util.Arrays; import java.util.Calendar; import java.util.Collection; import java.util.Date; @@ -7388,7 +7387,7 @@ public class PlayerInstance extends Playable return false; } - final ItemInstance[] unequiped = getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequiped = getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (ItemInstance element : unequiped) { @@ -7400,19 +7399,20 @@ public class PlayerInstance extends Playable broadcastUserInfo(); // this can be 0 if the user pressed the right mousebutton twice very fast - if (unequiped.length > 0) + if (!unequiped.isEmpty()) { SystemMessage sm = null; - if (unequiped[0].getEnchantLevel() > 0) + final ItemInstance unequipedItem = unequiped.get(0); + if (unequipedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED); - sm.addNumber(unequiped[0].getEnchantLevel()); - sm.addItemName(unequiped[0].getItemId()); + sm.addNumber(unequipedItem.getEnchantLevel()); + sm.addItemName(unequipedItem.getItemId()); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_DISARMED); - sm.addItemName(unequiped[0].getItemId()); + sm.addItemName(unequipedItem.getItemId()); } sendPacket(sm); } @@ -7427,7 +7427,7 @@ public class PlayerInstance extends Playable return false; } - final ItemInstance[] unequiped = getInventory().unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); + final List unequiped = getInventory().unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (ItemInstance element : unequiped) { @@ -7439,19 +7439,20 @@ public class PlayerInstance extends Playable broadcastUserInfo(); // this can be 0 if the user pressed the right mousebutton twice very fast - if (unequiped.length > 0) + if (!unequiped.isEmpty()) { SystemMessage sm = null; - if (unequiped[0].getEnchantLevel() > 0) + final ItemInstance item = unequiped.get(0); + if (item.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED); - sm.addNumber(unequiped[0].getEnchantLevel()); - sm.addItemName(unequiped[0].getItemId()); + sm.addNumber(item.getEnchantLevel()); + sm.addItemName(item.getItemId()); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_DISARMED); - sm.addItemName(unequiped[0].getItemId()); + sm.addItemName(item.getItemId()); } sendPacket(sm); } @@ -11762,9 +11763,8 @@ public class PlayerInstance extends Playable final ItemInstance rhand = getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); if (rhand != null) { - final ItemInstance[] unequipped = getInventory().unEquipItemInBodySlotAndRecord(rhand.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance element : unequipped) + for (ItemInstance element : getInventory().unEquipItemInBodySlotAndRecord(rhand.getItem().getBodyPart())) { iu.addModifiedItem(element); } @@ -11778,9 +11778,8 @@ public class PlayerInstance extends Playable final ItemInstance chest = getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST); if (chest != null) { - final ItemInstance[] unequipped = getInventory().unEquipItemInBodySlotAndRecord(chest.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance element : unequipped) + for (ItemInstance element : getInventory().unEquipItemInBodySlotAndRecord(chest.getItem().getBodyPart())) { iu.addModifiedItem(element); } @@ -11794,9 +11793,8 @@ public class PlayerInstance extends Playable final ItemInstance legs = getInventory().getPaperdollItem(Inventory.PAPERDOLL_LEGS); if (legs != null) { - final ItemInstance[] unequipped = getInventory().unEquipItemInBodySlotAndRecord(legs.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance element : unequipped) + for (ItemInstance element : getInventory().unEquipItemInBodySlotAndRecord(legs.getItem().getBodyPart())) { iu.addModifiedItem(element); } @@ -12103,9 +12101,8 @@ public class PlayerInstance extends Playable final ItemInstance rhand = getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); if (rhand != null) { - final ItemInstance[] unequipped = getInventory().unEquipItemInBodySlotAndRecord(rhand.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance element : unequipped) + for (ItemInstance element : getInventory().unEquipItemInBodySlotAndRecord(rhand.getItem().getBodyPart())) { iu.addModifiedItem(element); } @@ -12119,9 +12116,8 @@ public class PlayerInstance extends Playable final ItemInstance chest = getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST); if (chest != null) { - final ItemInstance[] unequipped = getInventory().unEquipItemInBodySlotAndRecord(chest.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance element : unequipped) + for (ItemInstance element : getInventory().unEquipItemInBodySlotAndRecord(chest.getItem().getBodyPart())) { iu.addModifiedItem(element); } @@ -12135,9 +12131,8 @@ public class PlayerInstance extends Playable final ItemInstance legs = getInventory().getPaperdollItem(Inventory.PAPERDOLL_LEGS); if (legs != null) { - final ItemInstance[] unequipped = getInventory().unEquipItemInBodySlotAndRecord(legs.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance element : unequipped) + for (ItemInstance element : getInventory().unEquipItemInBodySlotAndRecord(legs.getItem().getBodyPart())) { iu.addModifiedItem(element); } @@ -15761,7 +15756,7 @@ public class PlayerInstance extends Playable return false; } - if ((_inventory.getAllItemsByItemId(itemId) == null) || (_inventory.getAllItemsByItemId(itemId).length == 0)) + if ((_inventory.getAllItemsByItemId(itemId) == null) || _inventory.getAllItemsByItemId(itemId).isEmpty()) { return false; } @@ -15826,12 +15821,11 @@ public class PlayerInstance extends Playable final ItemInstance equippedItem = getInventory().getPaperdollItem(i); if ((equippedItem != null) && !equippedItem.checkOlympCondition()) { - final ItemInstance[] items = getInventory().unEquipItemInSlotAndRecord(i); + final List items = getInventory().unEquipItemInSlotAndRecord(i); if (equippedItem.isWear()) { continue; } - SystemMessage sm = null; if (equippedItem.getEnchantLevel() > 0) { @@ -15846,7 +15840,7 @@ public class PlayerInstance extends Playable } sendPacket(sm); final InventoryUpdate iu = new InventoryUpdate(); - iu.addItems(Arrays.asList(items)); + iu.addItems(items); sendPacket(iu); broadcastUserInfo(); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index e3d4ca0384..9b6dca5723 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -181,11 +181,11 @@ public abstract class Inventory extends ItemContainer /** * Returns alterations in inventory - * @return ItemInstance[] : array of alterated items + * @return List : list of alterated items */ - public ItemInstance[] getChangedItems() + public List getChangedItems() { - return _changed.toArray(new ItemInstance[_changed.size()]); + return _changed; } } @@ -1024,9 +1024,9 @@ public abstract class Inventory extends ItemContainer /** * Unequips item in body slot and returns alterations. * @param slot : int designating the slot of the paperdoll - * @return ItemInstance[] : list of changes + * @return List : list of changes */ - public ItemInstance[] unEquipItemInBodySlotAndRecord(int slot) + public List unEquipItemInBodySlotAndRecord(int slot) { final ChangeRecorder recorder = newRecorder(); @@ -1061,9 +1061,9 @@ public abstract class Inventory extends ItemContainer /** * Unepquips item in slot and returns alterations * @param slot : int designating the slot - * @return ItemInstance[] : list of items altered + * @return List : list of items altered */ - public ItemInstance[] unEquipItemInSlotAndRecord(int slot) + public List unEquipItemInSlotAndRecord(int slot) { final ChangeRecorder recorder = newRecorder(); @@ -1202,9 +1202,9 @@ public abstract class Inventory extends ItemContainer /** * Equips item and returns list of alterations * @param item : ItemInstance corresponding to the item - * @return ItemInstance[] : list of alterations + * @return List : list of alterations */ - public ItemInstance[] equipItemAndRecord(ItemInstance item) + public List equipItemAndRecord(ItemInstance item) { final ChangeRecorder recorder = newRecorder(); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 62839b0615..5af0dd531e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -92,12 +92,12 @@ public class PlayerInventory extends Inventory * @param allowEquipped * @return ItemInstance : items in inventory */ - public ItemInstance[] getUniqueItems(boolean allowAdena, boolean allowAncientAdena, boolean allowEquipped) + public List getUniqueItems(boolean allowAdena, boolean allowAncientAdena, boolean allowEquipped) { return getUniqueItems(allowAdena, allowAncientAdena, true, allowEquipped); } - public ItemInstance[] getUniqueItems(boolean allowAdena, boolean allowAncientAdena, boolean onlyAvailable, boolean allowEquipped) + public List getUniqueItems(boolean allowAdena, boolean allowAncientAdena, boolean onlyAvailable, boolean allowEquipped) { final List list = new ArrayList<>(); for (ItemInstance item : _items) @@ -126,7 +126,7 @@ public class PlayerInventory extends Inventory } } - return list.toArray(new ItemInstance[list.size()]); + return list; } /** @@ -136,12 +136,12 @@ public class PlayerInventory extends Inventory * @param allowEquipped * @return ItemInstance : items in inventory */ - public ItemInstance[] getUniqueItemsByEnchantLevel(boolean allowAdena, boolean allowAncientAdena, boolean allowEquipped) + public List getUniqueItemsByEnchantLevel(boolean allowAdena, boolean allowAncientAdena, boolean allowEquipped) { return getUniqueItemsByEnchantLevel(allowAdena, allowAncientAdena, true, allowEquipped); } - public ItemInstance[] getUniqueItemsByEnchantLevel(boolean allowAdena, boolean allowAncientAdena, boolean onlyAvailable, boolean allowEquipped) + public List getUniqueItemsByEnchantLevel(boolean allowAdena, boolean allowAncientAdena, boolean onlyAvailable, boolean allowEquipped) { final List list = new ArrayList<>(); for (ItemInstance item : _items) @@ -171,15 +171,15 @@ public class PlayerInventory extends Inventory } } - return list.toArray(new ItemInstance[list.size()]); + return list; } /** * Returns the list of all items in inventory that have a given item id. * @param itemId - * @return ItemInstance[] : matching items from inventory + * @return List : matching items from inventory */ - public ItemInstance[] getAllItemsByItemId(int itemId) + public List getAllItemsByItemId(int itemId) { final List list = new ArrayList<>(); for (ItemInstance item : _items) @@ -189,16 +189,16 @@ public class PlayerInventory extends Inventory list.add(item); } } - return list.toArray(new ItemInstance[list.size()]); + return list; } /** * Returns the list of all items in inventory that have a given item id AND a given enchantment level. * @param itemId * @param enchantment - * @return ItemInstance[] : matching items from inventory + * @return List : matching items from inventory */ - public ItemInstance[] getAllItemsByItemId(int itemId, int enchantment) + public List getAllItemsByItemId(int itemId, int enchantment) { final List list = new ArrayList<>(); for (ItemInstance item : _items) @@ -208,7 +208,7 @@ public class PlayerInventory extends Inventory list.add(item); } } - return list.toArray(new ItemInstance[list.size()]); + return list; } /** @@ -216,7 +216,7 @@ public class PlayerInventory extends Inventory * @param allowAdena * @return ItemInstance : items in inventory */ - public ItemInstance[] getAvailableItems(boolean allowAdena) + public List getAvailableItems(boolean allowAdena) { final List list = new ArrayList<>(); for (ItemInstance item : _items) @@ -226,7 +226,7 @@ public class PlayerInventory extends Inventory list.add(item); } } - return list.toArray(new ItemInstance[list.size()]); + return list; } /** @@ -234,7 +234,7 @@ public class PlayerInventory extends Inventory * @param tradeList * @return ItemInstance : items in inventory */ - public TradeItem[] getAvailableItems(TradeList tradeList) + public List getAvailableItems(TradeList tradeList) { final List list = new ArrayList<>(); for (ItemInstance item : _items) @@ -248,7 +248,7 @@ public class PlayerInventory extends Inventory } } } - return list.toArray(new TradeItem[list.size()]); + return list; } /** @@ -718,15 +718,14 @@ public class PlayerInventory extends Inventory public boolean checkIfEquipped(int itemId) { - final ItemInstance[] items = getAllItemsByItemId(itemId); - if ((items == null) || (items.length == 0)) + if (_items == null) { return false; } - for (ItemInstance item : items) + for (ItemInstance item : _items) { - if (item.isEquipped()) + if (item.isEquipped() && (item.getItemId() == itemId)) { return true; } @@ -737,16 +736,15 @@ public class PlayerInventory extends Inventory public int checkHowManyEquipped(int itemId) { - final ItemInstance[] items = getAllItemsByItemId(itemId); - if ((items == null) || (items.length == 0)) + if (_items == null) { return 0; } int count = 0; - for (ItemInstance item : items) + for (ItemInstance item : _items) { - if (item.isEquipped()) + if (item.isEquipped() && (item.getItemId() == itemId)) { count++; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java index 698301880e..f03475ebb2 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -743,15 +743,12 @@ public class ItemInstance extends WorldObject // unequip if (isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(getEquipSlot()); final InventoryUpdate iu = new InventoryUpdate(); - - for (ItemInstance element : unequiped) + for (ItemInstance element : player.getInventory().unEquipItemInSlotAndRecord(getEquipSlot())) { player.checkSSMatch(null, element); iu.addModifiedItem(element); } - player.sendPacket(iu); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 7d9d36a3c1..d4b3d882b1 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -222,7 +222,7 @@ public class Hero public synchronized void computeNewHeroes(List newHeroes) { updateHeroes(true); - ItemInstance[] items; + List items; InventoryUpdate iu; if (HEROES.size() != 0) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 3eb78fd199..24fd2f1b65 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -299,21 +299,20 @@ public class MultiSellChoose implements IClientIncomingPacket return; } } - else // a) if enchantment is maintained, then get a list of items that exactly match this enchantment - if (maintainEnchantment) + else if (maintainEnchantment) // a) if enchantment is maintained, then get a list of items that exactly match this enchantment { // loop through this list and remove (one by one) each item until the required amount is taken. - final ItemInstance[] inventoryContents = inv.getAllItemsByItemId(e.getItemId(), e.getEnchantmentLevel()); + final List inventoryContents = inv.getAllItemsByItemId(e.getItemId(), e.getEnchantmentLevel()); for (int i = 0; i < (e.getItemCount() * _amount); i++) { - if (!player.destroyItem("Multisell", inventoryContents[i].getObjectId(), 1, player.getTarget(), true)) + final ItemInstance item = inventoryContents.get(i); + if (!player.destroyItem("Multisell", item.getObjectId(), 1, player.getTarget(), true)) { return; } } } - else - // b) enchantment is not maintained. Get the instances with the LOWEST enchantment level + else // b) enchantment is not maintained. Get the instances with the LOWEST enchantment level { /* * NOTE: There are 2 ways to achieve the above goal. 1) Get all items that have the correct itemId, loop through them until the lowest enchantment level is found. Repeat all this for the next item until proper count of items is reached. 2) Get all items that have the correct @@ -329,8 +328,8 @@ public class MultiSellChoose implements IClientIncomingPacket // choice 1. Small number of items exchanged. No sorting. for (int i = 1; i <= (e.getItemCount() * _amount); i++) { - final ItemInstance[] inventoryContents = inv.getAllItemsByItemId(e.getItemId()); - itemToTake = inventoryContents[0]; + final List inventoryContents = inv.getAllItemsByItemId(e.getItemId()); + itemToTake = inventoryContents.get(0); // get item with the LOWEST enchantment level from the inventory... // +0 is lowest by default... if (itemToTake.getEnchantLevel() > 0) @@ -340,8 +339,7 @@ public class MultiSellChoose implements IClientIncomingPacket if (inventoryContent.getEnchantLevel() < itemToTake.getEnchantLevel()) { itemToTake = inventoryContent; - // nothing will have enchantment less than 0. If a zero-enchanted - // item is found, just take it + // nothing will have enchantment less than 0. If a zero-enchanted item is found, just take it if (itemToTake.getEnchantLevel() == 0) { break; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 7ad59531cf..5e894216a0 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -160,9 +160,8 @@ public class RequestCrystallizeItem implements IClientIncomingPacket // unequip if needed if (itemToRemove.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getEquipSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance element : unequiped) + for (ItemInstance element : player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getEquipSlot())) { iu.addModifiedItem(element); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 266211efae..5ac1ec7676 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -111,14 +111,12 @@ public class RequestDestroyItem implements IClientIncomingPacket if (itemToRemove.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getEquipSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance element : unequiped) + for (ItemInstance element : player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getEquipSlot())) { player.checkSSMatch(null, element); iu.addModifiedItem(element); } - player.sendPacket(iu); player.broadcastUserInfo(); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index dae6cb9d79..4945242bda 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -186,9 +186,8 @@ public class RequestDropItem implements IClientIncomingPacket if (item.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(item.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance element : unequiped) + for (ItemInstance element : player.getInventory().unEquipItemInBodySlotAndRecord(item.getItem().getBodyPart())) { player.checkSSMatch(null, element); iu.addModifiedItem(element); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index a4d7dbbdce..bafa03d43b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -659,14 +659,12 @@ public class RequestEnchantItem implements IClientIncomingPacket if (item.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(item.getEquipSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance element : unequiped) + for (ItemInstance element : player.getInventory().unEquipItemInSlotAndRecord(item.getEquipSlot())) { iu.addModifiedItem(element); } player.sendPacket(iu); - player.broadcastUserInfo(); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java index 32898da858..93ff72e66f 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.PackageSendableList; @@ -57,7 +56,6 @@ public class RequestPackageSendableItemList implements IClientIncomingPacket return; } - final ItemInstance[] items = player.getInventory().getAvailableItems(true); - player.sendPacket(new PackageSendableList(items, _objectID, player.getAdena())); + player.sendPacket(new PackageSendableList(player.getInventory().getAvailableItems(true), _objectID, player.getAdena())); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index d3f82795ec..ec1d929d4c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import java.util.List; + import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.WorldObject; @@ -84,7 +86,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK); } - final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); + final List unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); // show the update in the inventory final InventoryUpdate iu = new InventoryUpdate(); @@ -94,23 +96,23 @@ public class RequestUnEquipItem implements IClientIncomingPacket iu.addModifiedItem(element); } player.sendPacket(iu); - player.broadcastUserInfo(); // this can be 0 if the user pressed the right mouse button twice very fast - if (unequiped.length > 0) + if (!unequiped.isEmpty()) { SystemMessage sm = null; - if (unequiped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequiped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED); - sm.addNumber(unequiped[0].getEnchantLevel()); - sm.addItemName(unequiped[0].getItemId()); + sm.addNumber(unequippedItem.getEnchantLevel()); + sm.addItemName(unequippedItem.getItemId()); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_DISARMED); - sm.addItemName(unequiped[0].getItemId()); + sm.addItemName(unequippedItem.getItemId()); } player.sendPacket(sm); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 07531e44b1..630602414c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import org.l2jmobius.Config; @@ -144,9 +143,6 @@ public class UseItem implements IClientIncomingPacket player.cancelActiveTrade(); } - // NOTE: disabled due to deadlocks - // synchronized (activeChar.getInventory()) - // { if (item.isWear()) { // No unequipping wear-items @@ -407,7 +403,7 @@ public class UseItem implements IClientIncomingPacket } // Equip or unEquip - ItemInstance[] items = null; + List items = null; final boolean isEquiped = item.isEquipped(); SystemMessage sm = null; if (item.getItem().getType2() == Item.TYPE2_WEAPON) @@ -587,13 +583,13 @@ public class UseItem implements IClientIncomingPacket { player.broadcastUserInfo(); final InventoryUpdate iu = new InventoryUpdate(); - iu.addItems(Arrays.asList(items)); + iu.addItems(items); player.sendPacket(iu); } else if ((item.getItem().getBodyPart() & Item.SLOT_HEAD) > 0) { final InventoryUpdate iu = new InventoryUpdate(); - iu.addItems(Arrays.asList(items)); + iu.addItems(items); player.sendPacket(iu); player.sendPacket(new UserInfo(player)); } @@ -627,6 +623,5 @@ public class UseItem implements IClientIncomingPacket } } } - // } } } \ No newline at end of file diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index ec72d8c4cc..457ae255bc 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.List; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -25,11 +27,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class PackageSendableList implements IClientOutgoingPacket { - private final ItemInstance[] _items; + private final List _items; private final int _playerObjId; private final int _adena; - public PackageSendableList(ItemInstance[] items, int playerObjId, int adena) + public PackageSendableList(List items, int playerObjId, int adena) { _items = items; _playerObjId = playerObjId; @@ -43,7 +45,7 @@ public class PackageSendableList implements IClientOutgoingPacket packet.writeD(_playerObjId); packet.writeD(_adena); - packet.writeD(_items.length); + packet.writeD(_items.size()); for (ItemInstance item : _items) // format inside the for taken from SellList part use should be about the same { packet.writeH(item.getItem().getType1()); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index fbc790529d..2376610ccb 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.List; + import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.TradeList; @@ -30,7 +32,7 @@ public class PrivateStoreManageListBuy implements IClientOutgoingPacket { private final PlayerInstance _player; private int _playerAdena; - private final ItemInstance[] _itemList; + private final List _itemList; private final TradeList.TradeItem[] _buyList; public PrivateStoreManageListBuy(PlayerInstance player) @@ -58,7 +60,7 @@ public class PrivateStoreManageListBuy implements IClientOutgoingPacket packet.writeD(_playerAdena); // section2 - packet.writeD(_itemList.length); // inventory items for potential buy + packet.writeD(_itemList.size()); // inventory items for potential buy for (ItemInstance item : _itemList) { packet.writeD(item.getItemId()); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java index 3b1aafa480..2c43b3f8fb 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.List; + import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.TradeList.TradeItem; @@ -35,7 +37,7 @@ public class PrivateStoreManageListSell implements IClientOutgoingPacket private final PlayerInstance _player; private int _playerAdena; private final boolean _packageSale; - private final TradeItem[] _itemList; + private final List _itemList; private final TradeItem[] _sellList; public PrivateStoreManageListSell(PlayerInstance player) @@ -69,7 +71,7 @@ public class PrivateStoreManageListSell implements IClientOutgoingPacket packet.writeD(_playerAdena); // section2 - packet.writeD(_itemList.length); // for potential sells + packet.writeD(_itemList.size()); // for potential sells for (TradeItem item : _itemList) { packet.writeD(item.getItem().getType2()); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index 63b05ed971..d7bd9d2b5d 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.List; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -27,7 +29,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class TradeStart implements IClientOutgoingPacket { private final PlayerInstance _player; - private final ItemInstance[] _itemList; + private final List _itemList; public TradeStart(PlayerInstance player) { @@ -47,7 +49,7 @@ public class TradeStart implements IClientOutgoingPacket OutgoingPackets.TRADE_START.writeId(packet); packet.writeD(_player.getActiveTradeList().getPartner().getObjectId()); // writeD((_activeChar != null || _activeChar.getTransactionRequester() != null)? _activeChar.getTransactionRequester().getObjectId() : 0); - packet.writeH(_itemList.length); + packet.writeH(_itemList.size()); for (ItemInstance item : _itemList)// int i = 0; i < count; i++) { packet.writeH(item.getItem().getType1()); // item type1 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index b63e5b4dbd..47bf56026f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -111,7 +111,7 @@ public class MultisellData return list; } - ItemInstance[] items; + List items; if (listTemplate.getMaintainEnchantment()) { items = player.getInventory().getUniqueItemsByEnchantLevel(false, false, false, true); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/events/CTF.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/events/CTF.java index b8f92d0bc2..4e65aaa2f8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/events/CTF.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/events/CTF.java @@ -2873,10 +2873,9 @@ public class CTF implements EventTask player._haveFlagCTF = false; if (wpn != null) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); player.getInventory().destroyItemByItemId("", _FLAG_IN_HAND_ITEM_ID, 1, player, null); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance element : unequiped) + for (ItemInstance element : player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart())) { iu.addModifiedItem(element); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 7a687deb76..f94ede4fda 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; -import java.util.Arrays; import java.util.Calendar; import java.util.Collection; import java.util.Date; @@ -7538,7 +7537,7 @@ public class PlayerInstance extends Playable wpn.getAugmentation().removeBonus(this); } - final ItemInstance[] unequiped = getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequiped = getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (ItemInstance element : unequiped) { @@ -7550,19 +7549,20 @@ public class PlayerInstance extends Playable broadcastUserInfo(); // this can be 0 if the user pressed the right mousebutton twice very fast - if (unequiped.length > 0) + if (!unequiped.isEmpty()) { SystemMessage sm = null; - if (unequiped[0].getEnchantLevel() > 0) + final ItemInstance unequipedItem = unequiped.get(0); + if (unequipedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED); - sm.addNumber(unequiped[0].getEnchantLevel()); - sm.addItemName(unequiped[0].getItemId()); + sm.addNumber(unequipedItem.getEnchantLevel()); + sm.addItemName(unequipedItem.getItemId()); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_DISARMED); - sm.addItemName(unequiped[0].getItemId()); + sm.addItemName(unequipedItem.getItemId()); } sendPacket(sm); } @@ -7577,7 +7577,7 @@ public class PlayerInstance extends Playable return false; } - final ItemInstance[] unequiped = getInventory().unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); + final List unequiped = getInventory().unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (ItemInstance element : unequiped) { @@ -7589,19 +7589,20 @@ public class PlayerInstance extends Playable broadcastUserInfo(); // this can be 0 if the user pressed the right mousebutton twice very fast - if (unequiped.length > 0) + if (!unequiped.isEmpty()) { SystemMessage sm = null; - if (unequiped[0].getEnchantLevel() > 0) + final ItemInstance item = unequiped.get(0); + if (item.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED); - sm.addNumber(unequiped[0].getEnchantLevel()); - sm.addItemName(unequiped[0].getItemId()); + sm.addNumber(item.getEnchantLevel()); + sm.addItemName(item.getItemId()); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_DISARMED); - sm.addItemName(unequiped[0].getItemId()); + sm.addItemName(item.getItemId()); } sendPacket(sm); } @@ -12063,9 +12064,8 @@ public class PlayerInstance extends Playable final ItemInstance rhand = getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); if (rhand != null) { - final ItemInstance[] unequipped = getInventory().unEquipItemInBodySlotAndRecord(rhand.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance element : unequipped) + for (ItemInstance element : getInventory().unEquipItemInBodySlotAndRecord(rhand.getItem().getBodyPart())) { iu.addModifiedItem(element); } @@ -12079,9 +12079,8 @@ public class PlayerInstance extends Playable final ItemInstance chest = getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST); if (chest != null) { - final ItemInstance[] unequipped = getInventory().unEquipItemInBodySlotAndRecord(chest.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance element : unequipped) + for (ItemInstance element : getInventory().unEquipItemInBodySlotAndRecord(chest.getItem().getBodyPart())) { iu.addModifiedItem(element); } @@ -12095,9 +12094,8 @@ public class PlayerInstance extends Playable final ItemInstance legs = getInventory().getPaperdollItem(Inventory.PAPERDOLL_LEGS); if (legs != null) { - final ItemInstance[] unequipped = getInventory().unEquipItemInBodySlotAndRecord(legs.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance element : unequipped) + for (ItemInstance element : getInventory().unEquipItemInBodySlotAndRecord(legs.getItem().getBodyPart())) { iu.addModifiedItem(element); } @@ -12410,9 +12408,8 @@ public class PlayerInstance extends Playable final ItemInstance rhand = getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); if (rhand != null) { - final ItemInstance[] unequipped = getInventory().unEquipItemInBodySlotAndRecord(rhand.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance element : unequipped) + for (ItemInstance element : getInventory().unEquipItemInBodySlotAndRecord(rhand.getItem().getBodyPart())) { iu.addModifiedItem(element); } @@ -12426,9 +12423,8 @@ public class PlayerInstance extends Playable final ItemInstance chest = getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST); if (chest != null) { - final ItemInstance[] unequipped = getInventory().unEquipItemInBodySlotAndRecord(chest.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance element : unequipped) + for (ItemInstance element : getInventory().unEquipItemInBodySlotAndRecord(chest.getItem().getBodyPart())) { iu.addModifiedItem(element); } @@ -12442,9 +12438,8 @@ public class PlayerInstance extends Playable final ItemInstance legs = getInventory().getPaperdollItem(Inventory.PAPERDOLL_LEGS); if (legs != null) { - final ItemInstance[] unequipped = getInventory().unEquipItemInBodySlotAndRecord(legs.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance element : unequipped) + for (ItemInstance element : getInventory().unEquipItemInBodySlotAndRecord(legs.getItem().getBodyPart())) { iu.addModifiedItem(element); } @@ -16130,7 +16125,7 @@ public class PlayerInstance extends Playable return false; } - if ((_inventory.getAllItemsByItemId(itemId) == null) || (_inventory.getAllItemsByItemId(itemId).length == 0)) + if ((_inventory.getAllItemsByItemId(itemId) == null) || _inventory.getAllItemsByItemId(itemId).isEmpty()) { return false; } @@ -16199,7 +16194,7 @@ public class PlayerInstance extends Playable { equippedItem.getAugmentation().removeBonus(this); } - final ItemInstance[] items = getInventory().unEquipItemInSlotAndRecord(i); + final List items = getInventory().unEquipItemInSlotAndRecord(i); if (equippedItem.isWear()) { continue; @@ -16218,7 +16213,7 @@ public class PlayerInstance extends Playable } sendPacket(sm); final InventoryUpdate iu = new InventoryUpdate(); - iu.addItems(Arrays.asList(items)); + iu.addItems(items); sendPacket(iu); broadcastUserInfo(); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 811137363d..489a4fa9e3 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -181,11 +181,11 @@ public abstract class Inventory extends ItemContainer /** * Returns alterations in inventory - * @return ItemInstance[] : array of alterated items + * @return List : list of alterated items */ - public ItemInstance[] getChangedItems() + public List getChangedItems() { - return _changed.toArray(new ItemInstance[_changed.size()]); + return _changed; } } @@ -1043,9 +1043,9 @@ public abstract class Inventory extends ItemContainer /** * Unequips item in body slot and returns alterations. * @param slot : int designating the slot of the paperdoll - * @return ItemInstance[] : list of changes + * @return List : list of changes */ - public ItemInstance[] unEquipItemInBodySlotAndRecord(int slot) + public List unEquipItemInBodySlotAndRecord(int slot) { final ChangeRecorder recorder = newRecorder(); @@ -1080,9 +1080,9 @@ public abstract class Inventory extends ItemContainer /** * Unepquips item in slot and returns alterations * @param slot : int designating the slot - * @return ItemInstance[] : list of items altered + * @return List : list of items altered */ - public ItemInstance[] unEquipItemInSlotAndRecord(int slot) + public List unEquipItemInSlotAndRecord(int slot) { final ChangeRecorder recorder = newRecorder(); @@ -1221,9 +1221,9 @@ public abstract class Inventory extends ItemContainer /** * Equips item and returns list of alterations * @param item : ItemInstance corresponding to the item - * @return ItemInstance[] : list of alterations + * @return List : list of alterations */ - public ItemInstance[] equipItemAndRecord(ItemInstance item) + public List equipItemAndRecord(ItemInstance item) { final ChangeRecorder recorder = newRecorder(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index f0086795d6..620dd83d2f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -92,12 +92,12 @@ public class PlayerInventory extends Inventory * @param allowEquipped * @return ItemInstance : items in inventory */ - public ItemInstance[] getUniqueItems(boolean allowAdena, boolean allowAncientAdena, boolean allowEquipped) + public List getUniqueItems(boolean allowAdena, boolean allowAncientAdena, boolean allowEquipped) { return getUniqueItems(allowAdena, allowAncientAdena, true, allowEquipped); } - public ItemInstance[] getUniqueItems(boolean allowAdena, boolean allowAncientAdena, boolean onlyAvailable, boolean allowEquipped) + public List getUniqueItems(boolean allowAdena, boolean allowAncientAdena, boolean onlyAvailable, boolean allowEquipped) { final List list = new ArrayList<>(); for (ItemInstance item : _items) @@ -126,7 +126,7 @@ public class PlayerInventory extends Inventory } } - return list.toArray(new ItemInstance[list.size()]); + return list; } /** @@ -136,12 +136,12 @@ public class PlayerInventory extends Inventory * @param allowEquipped * @return ItemInstance : items in inventory */ - public ItemInstance[] getUniqueItemsByEnchantLevel(boolean allowAdena, boolean allowAncientAdena, boolean allowEquipped) + public List getUniqueItemsByEnchantLevel(boolean allowAdena, boolean allowAncientAdena, boolean allowEquipped) { return getUniqueItemsByEnchantLevel(allowAdena, allowAncientAdena, true, allowEquipped); } - public ItemInstance[] getUniqueItemsByEnchantLevel(boolean allowAdena, boolean allowAncientAdena, boolean onlyAvailable, boolean allowEquipped) + public List getUniqueItemsByEnchantLevel(boolean allowAdena, boolean allowAncientAdena, boolean onlyAvailable, boolean allowEquipped) { final List list = new ArrayList<>(); for (ItemInstance item : _items) @@ -171,15 +171,15 @@ public class PlayerInventory extends Inventory } } - return list.toArray(new ItemInstance[list.size()]); + return list; } /** * Returns the list of all items in inventory that have a given item id. * @param itemId - * @return ItemInstance[] : matching items from inventory + * @return List : matching items from inventory */ - public ItemInstance[] getAllItemsByItemId(int itemId) + public List getAllItemsByItemId(int itemId) { final List list = new ArrayList<>(); for (ItemInstance item : _items) @@ -189,16 +189,16 @@ public class PlayerInventory extends Inventory list.add(item); } } - return list.toArray(new ItemInstance[list.size()]); + return list; } /** * Returns the list of all items in inventory that have a given item id AND a given enchantment level. * @param itemId * @param enchantment - * @return ItemInstance[] : matching items from inventory + * @return List : matching items from inventory */ - public ItemInstance[] getAllItemsByItemId(int itemId, int enchantment) + public List getAllItemsByItemId(int itemId, int enchantment) { final List list = new ArrayList<>(); for (ItemInstance item : _items) @@ -208,7 +208,7 @@ public class PlayerInventory extends Inventory list.add(item); } } - return list.toArray(new ItemInstance[list.size()]); + return list; } /** @@ -216,7 +216,7 @@ public class PlayerInventory extends Inventory * @param allowAdena * @return ItemInstance : items in inventory */ - public ItemInstance[] getAvailableItems(boolean allowAdena) + public List getAvailableItems(boolean allowAdena) { final List list = new ArrayList<>(); for (ItemInstance item : _items) @@ -226,14 +226,14 @@ public class PlayerInventory extends Inventory list.add(item); } } - return list.toArray(new ItemInstance[list.size()]); + return list; } /** * Get all augmented items * @return */ - public ItemInstance[] getAugmentedItems() + public List getAugmentedItems() { final List list = new ArrayList<>(); for (ItemInstance item : _items) @@ -243,7 +243,7 @@ public class PlayerInventory extends Inventory list.add(item); } } - return list.toArray(new ItemInstance[list.size()]); + return list; } /** @@ -251,7 +251,7 @@ public class PlayerInventory extends Inventory * @param tradeList * @return ItemInstance : items in inventory */ - public TradeItem[] getAvailableItems(TradeList tradeList) + public List getAvailableItems(TradeList tradeList) { final List list = new ArrayList<>(); for (ItemInstance item : _items) @@ -265,7 +265,7 @@ public class PlayerInventory extends Inventory } } } - return list.toArray(new TradeItem[list.size()]); + return list; } /** @@ -735,15 +735,14 @@ public class PlayerInventory extends Inventory public boolean checkIfEquipped(int itemId) { - final ItemInstance[] items = getAllItemsByItemId(itemId); - if ((items == null) || (items.length == 0)) + if (_items == null) { return false; } - for (ItemInstance item : items) + for (ItemInstance item : _items) { - if (item.isEquipped()) + if (item.isEquipped() && (item.getItemId() == itemId)) { return true; } @@ -754,16 +753,15 @@ public class PlayerInventory extends Inventory public int checkHowManyEquipped(int itemId) { - final ItemInstance[] items = getAllItemsByItemId(itemId); - if ((items == null) || (items.length == 0)) + if (_items == null) { return 0; } int count = 0; - for (ItemInstance item : items) + for (ItemInstance item : _items) { - if (item.isEquipped()) + if (item.isEquipped() && (item.getItemId() == itemId)) { count++; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java index d96a66816b..698d4cc6bb 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -792,15 +792,12 @@ public class ItemInstance extends WorldObject // unequip if (isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(getEquipSlot()); final InventoryUpdate iu = new InventoryUpdate(); - - for (ItemInstance element : unequiped) + for (ItemInstance element : player.getInventory().unEquipItemInSlotAndRecord(getEquipSlot())) { player.checkSSMatch(null, element); iu.addModifiedItem(element); } - player.sendPacket(iu); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 7d9d36a3c1..d4b3d882b1 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -222,7 +222,7 @@ public class Hero public synchronized void computeNewHeroes(List newHeroes) { updateHeroes(true); - ItemInstance[] items; + List items; InventoryUpdate iu; if (HEROES.size() != 0) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 133ee33033..d7b795e2d4 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -300,31 +300,30 @@ public class MultiSellChoose implements IClientIncomingPacket return; } } - else // a) if enchantment is maintained, then get a list of items that exactly match this enchantment - if (maintainEnchantment) + else if (maintainEnchantment) // a) if enchantment is maintained, then get a list of items that exactly match this enchantment { // loop through this list and remove (one by one) each item until the required amount is taken. - final ItemInstance[] inventoryContents = inv.getAllItemsByItemId(e.getItemId(), e.getEnchantmentLevel()); + final List inventoryContents = inv.getAllItemsByItemId(e.getItemId(), e.getEnchantmentLevel()); for (int i = 0; i < (e.getItemCount() * _amount); i++) { - if (inventoryContents[i].isAugmented()) + final ItemInstance item = inventoryContents.get(i); + if (item.isAugmented()) { - augmentation.add(inventoryContents[i].getAugmentation()); + augmentation.add(item.getAugmentation()); } - if (inventoryContents[i].isEquipped() && inventoryContents[i].isAugmented()) + if (item.isEquipped() && item.isAugmented()) { - inventoryContents[i].getAugmentation().removeBonus(player); + item.getAugmentation().removeBonus(player); } - if (!player.destroyItem("Multisell", inventoryContents[i].getObjectId(), 1, player.getTarget(), true)) + if (!player.destroyItem("Multisell", item.getObjectId(), 1, player.getTarget(), true)) { return; } } } - else - // b) enchantment is not maintained. Get the instances with the LOWEST enchantment level + else // b) enchantment is not maintained. Get the instances with the LOWEST enchantment level { /* * NOTE: There are 2 ways to achieve the above goal. 1) Get all items that have the correct itemId, loop through them until the lowest enchantment level is found. Repeat all this for the next item until proper count of items is reached. 2) Get all items that have the correct @@ -340,8 +339,8 @@ public class MultiSellChoose implements IClientIncomingPacket // choice 1. Small number of items exchanged. No sorting. for (int i = 1; i <= (e.getItemCount() * _amount); i++) { - final ItemInstance[] inventoryContents = inv.getAllItemsByItemId(e.getItemId()); - itemToTake = inventoryContents[0]; + final List inventoryContents = inv.getAllItemsByItemId(e.getItemId()); + itemToTake = inventoryContents.get(0); // get item with the LOWEST enchantment level from the inventory... // +0 is lowest by default... if (itemToTake.getEnchantLevel() > 0) @@ -351,8 +350,7 @@ public class MultiSellChoose implements IClientIncomingPacket if (inventoryContent.getEnchantLevel() < itemToTake.getEnchantLevel()) { itemToTake = inventoryContent; - // nothing will have enchantment less than 0. If a zero-enchanted - // item is found, just take it + // nothing will have enchantment less than 0. If a zero-enchanted item is found, just take it if (itemToTake.getEnchantLevel() == 0) { break; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 42bfe19321..0704ab9565 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -165,9 +165,8 @@ public class RequestCrystallizeItem implements IClientIncomingPacket itemToRemove.getAugmentation().removeBonus(player); } - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getEquipSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance element : unequiped) + for (ItemInstance element : player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getEquipSlot())) { iu.addModifiedItem(element); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index c1af24f2ec..f76f0ffecb 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -117,14 +117,12 @@ public class RequestDestroyItem implements IClientIncomingPacket itemToRemove.getAugmentation().removeBonus(player); } - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getEquipSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance element : unequiped) + for (ItemInstance element : player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getEquipSlot())) { player.checkSSMatch(null, element); iu.addModifiedItem(element); } - player.sendPacket(iu); player.broadcastUserInfo(); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 3158c658d7..8659ecb8a9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -205,9 +205,8 @@ public class RequestDropItem implements IClientIncomingPacket item.getAugmentation().removeBonus(player); } - final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(item.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance element : unequiped) + for (ItemInstance element : player.getInventory().unEquipItemInBodySlotAndRecord(item.getItem().getBodyPart())) { player.checkSSMatch(null, element); iu.addModifiedItem(element); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 34af625255..7e83fe06dd 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -664,14 +664,12 @@ public class RequestEnchantItem implements IClientIncomingPacket item.getAugmentation().removeBonus(player); } - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(item.getEquipSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance element : unequiped) + for (ItemInstance element : player.getInventory().unEquipItemInSlotAndRecord(item.getEquipSlot())) { iu.addModifiedItem(element); } player.sendPacket(iu); - player.broadcastUserInfo(); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java index 32898da858..93ff72e66f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.PackageSendableList; @@ -57,7 +56,6 @@ public class RequestPackageSendableItemList implements IClientIncomingPacket return; } - final ItemInstance[] items = player.getInventory().getAvailableItems(true); - player.sendPacket(new PackageSendableList(items, _objectID, player.getAdena())); + player.sendPacket(new PackageSendableList(player.getInventory().getAvailableItems(true), _objectID, player.getAdena())); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java index 646a636869..c26f0e9647 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java @@ -137,8 +137,7 @@ public class RequestRefineCancel implements IClientIncomingPacket final InventoryUpdate iu = new InventoryUpdate(); if (targetItem.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot()); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index 19c65a701d..f2bf3b8dc2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import java.util.List; + import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.WorldObject; @@ -97,7 +99,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket item.getAugmentation().removeBonus(player); } - final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); + final List unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); // show the update in the inventory final InventoryUpdate iu = new InventoryUpdate(); @@ -107,23 +109,23 @@ public class RequestUnEquipItem implements IClientIncomingPacket iu.addModifiedItem(element); } player.sendPacket(iu); - player.broadcastUserInfo(); // this can be 0 if the user pressed the right mouse button twice very fast - if (unequiped.length > 0) + if (!unequiped.isEmpty()) { SystemMessage sm = null; - if (unequiped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequiped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED); - sm.addNumber(unequiped[0].getEnchantLevel()); - sm.addItemName(unequiped[0].getItemId()); + sm.addNumber(unequippedItem.getEnchantLevel()); + sm.addItemName(unequippedItem.getItemId()); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_DISARMED); - sm.addItemName(unequiped[0].getItemId()); + sm.addItemName(unequippedItem.getItemId()); } player.sendPacket(sm); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index a61001cb4e..394ea30137 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import org.l2jmobius.Config; @@ -145,9 +144,6 @@ public class UseItem implements IClientIncomingPacket player.cancelActiveTrade(); } - // NOTE: disabled due to deadlocks - // synchronized (activeChar.getInventory()) - // { if (item.isWear()) { // No unequipping wear-items @@ -429,7 +425,7 @@ public class UseItem implements IClientIncomingPacket } // Equip or unEquip - ItemInstance[] items = null; + List items = null; final boolean isEquiped = item.isEquipped(); SystemMessage sm = null; if (item.getItem().getType2() == Item.TYPE2_WEAPON) @@ -645,13 +641,13 @@ public class UseItem implements IClientIncomingPacket { player.broadcastUserInfo(); final InventoryUpdate iu = new InventoryUpdate(); - iu.addItems(Arrays.asList(items)); + iu.addItems(items); player.sendPacket(iu); } else if ((item.getItem().getBodyPart() & Item.SLOT_HEAD) > 0) { final InventoryUpdate iu = new InventoryUpdate(); - iu.addItems(Arrays.asList(items)); + iu.addItems(items); player.sendPacket(iu); player.sendPacket(new UserInfo(player)); } @@ -685,6 +681,5 @@ public class UseItem implements IClientIncomingPacket } } } - // } } } \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index ec72d8c4cc..457ae255bc 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.List; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -25,11 +27,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class PackageSendableList implements IClientOutgoingPacket { - private final ItemInstance[] _items; + private final List _items; private final int _playerObjId; private final int _adena; - public PackageSendableList(ItemInstance[] items, int playerObjId, int adena) + public PackageSendableList(List items, int playerObjId, int adena) { _items = items; _playerObjId = playerObjId; @@ -43,7 +45,7 @@ public class PackageSendableList implements IClientOutgoingPacket packet.writeD(_playerObjId); packet.writeD(_adena); - packet.writeD(_items.length); + packet.writeD(_items.size()); for (ItemInstance item : _items) // format inside the for taken from SellList part use should be about the same { packet.writeH(item.getItem().getType1()); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index fbc790529d..2376610ccb 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.List; + import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.TradeList; @@ -30,7 +32,7 @@ public class PrivateStoreManageListBuy implements IClientOutgoingPacket { private final PlayerInstance _player; private int _playerAdena; - private final ItemInstance[] _itemList; + private final List _itemList; private final TradeList.TradeItem[] _buyList; public PrivateStoreManageListBuy(PlayerInstance player) @@ -58,7 +60,7 @@ public class PrivateStoreManageListBuy implements IClientOutgoingPacket packet.writeD(_playerAdena); // section2 - packet.writeD(_itemList.length); // inventory items for potential buy + packet.writeD(_itemList.size()); // inventory items for potential buy for (ItemInstance item : _itemList) { packet.writeD(item.getItemId()); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java index 3b1aafa480..2c43b3f8fb 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.List; + import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.TradeList.TradeItem; @@ -35,7 +37,7 @@ public class PrivateStoreManageListSell implements IClientOutgoingPacket private final PlayerInstance _player; private int _playerAdena; private final boolean _packageSale; - private final TradeItem[] _itemList; + private final List _itemList; private final TradeItem[] _sellList; public PrivateStoreManageListSell(PlayerInstance player) @@ -69,7 +71,7 @@ public class PrivateStoreManageListSell implements IClientOutgoingPacket packet.writeD(_playerAdena); // section2 - packet.writeD(_itemList.length); // for potential sells + packet.writeD(_itemList.size()); // for potential sells for (TradeItem item : _itemList) { packet.writeD(item.getItem().getType2()); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index 63b05ed971..d7bd9d2b5d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.List; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -27,7 +29,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class TradeStart implements IClientOutgoingPacket { private final PlayerInstance _player; - private final ItemInstance[] _itemList; + private final List _itemList; public TradeStart(PlayerInstance player) { @@ -47,7 +49,7 @@ public class TradeStart implements IClientOutgoingPacket OutgoingPackets.TRADE_START.writeId(packet); packet.writeD(_player.getActiveTradeList().getPartner().getObjectId()); // writeD((_activeChar != null || _activeChar.getTransactionRequester() != null)? _activeChar.getTransactionRequester().getObjectId() : 0); - packet.writeH(_itemList.length); + packet.writeH(_itemList.size()); for (ItemInstance item : _itemList)// int i = 0; i < count; i++) { packet.writeH(item.getItem().getType1()); // item type1