diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/Observation.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/Observation.java index 9b177fff8d..8e202ab00f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/Observation.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/Observation.java @@ -160,7 +160,7 @@ public class Observation implements IBypassHandler { // enter mode player.enterObserverMode(pos); - player.sendItemList(false); + player.sendItemList(); } player.sendPacket(ActionFailed.STATIC_PACKET); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/RecipeController.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/RecipeController.java index 8fda49f426..ab595c9c11 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/RecipeController.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/RecipeController.java @@ -439,7 +439,7 @@ public class RecipeController updateCurMp(); _activeMakers.remove(_player.getObjectId()); _player.setIsCrafting(false); - _target.sendItemList(false); + _target.sendItemList(); } private void updateMakeInfo(boolean success) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/CombatFlag.java index 81b2197826..6bb59c8fba 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/CombatFlag.java @@ -92,7 +92,7 @@ public class CombatFlag } else { - _player.sendItemList(false); + _player.sendItemList(); } // Refresh player stats _player.broadcastUserInfo(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/CursedWeapon.java index 2265d6876c..7881f1e322 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/CursedWeapon.java @@ -126,7 +126,7 @@ public class CursedWeapon implements INamable } else { - _player.sendItemList(false); + _player.sendItemList(); } _player.broadcastUserInfo(); @@ -187,7 +187,7 @@ public class CursedWeapon implements INamable } else { - _player.sendItemList(false); + _player.sendItemList(); } _player.broadcastUserInfo(); @@ -453,7 +453,7 @@ public class CursedWeapon implements INamable } else { - _player.sendItemList(false); + _player.sendItemList(); } // Refresh player stats diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Clan.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Clan.java index 02322037c9..e3a4a149ea 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Clan.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Clan.java @@ -2609,7 +2609,7 @@ public class L2Clan implements IIdentifiable, INamable ui.addComponentType(UserInfoType.CURRENT_HPMPCP_EXP_SP); player.sendPacket(ui); - player.sendItemList(false); + player.sendItemList(); changeLevel(_level + 1); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/TradeList.java index 46aba4c60c..02605d01d6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/TradeList.java @@ -616,7 +616,7 @@ public class TradeList } else { - _owner.sendItemList(false); + _owner.sendItemList(); } if (partnerIU != null) @@ -625,7 +625,7 @@ public class TradeList } else { - _partner.sendItemList(false); + _partner.sendItemList(); } success = true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 1543aecef9..4458cbd5e6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -2949,7 +2949,7 @@ public final class L2PcInstance extends L2Playable } else { - sendItemList(false); + sendItemList(); } } } @@ -2990,7 +2990,7 @@ public final class L2PcInstance extends L2Playable } else { - sendItemList(false); + sendItemList(); } if (sendMessage) @@ -3040,7 +3040,7 @@ public final class L2PcInstance extends L2Playable } else { - sendItemList(false); + sendItemList(); } if (sendMessage) @@ -3093,7 +3093,7 @@ public final class L2PcInstance extends L2Playable } else { - sendItemList(false); + sendItemList(); } } } @@ -3134,7 +3134,7 @@ public final class L2PcInstance extends L2Playable } else { - sendItemList(false); + sendItemList(); } if (sendMessage) @@ -3360,7 +3360,7 @@ public final class L2PcInstance extends L2Playable } else { - sendItemList(false); + sendItemList(); } // Sends message to client if requested @@ -3474,7 +3474,7 @@ public final class L2PcInstance extends L2Playable } else { - sendItemList(false); + sendItemList(); } // Sends message to client if requested @@ -3538,7 +3538,7 @@ public final class L2PcInstance extends L2Playable } else { - sendItemList(false); + sendItemList(); } // Send target update packet @@ -3563,7 +3563,7 @@ public final class L2PcInstance extends L2Playable } else { - targetPlayer.sendItemList(false); + targetPlayer.sendItemList(); } } else if (target instanceof PetInventory) @@ -3690,7 +3690,7 @@ public final class L2PcInstance extends L2Playable } else { - sendItemList(false); + sendItemList(); } // Sends message to client if requested @@ -3777,7 +3777,7 @@ public final class L2PcInstance extends L2Playable } else { - sendItemList(false); + sendItemList(); } // Sends message to client if requested @@ -5861,7 +5861,7 @@ public final class L2PcInstance extends L2Playable { // Equip arrows needed in left hand _inventory.setPaperdollItem(Inventory.PAPERDOLL_LHAND, arrows); - sendItemList(false); + sendItemList(); return true; } } @@ -13735,13 +13735,10 @@ public final class L2PcInstance extends L2Playable sendPacket(new ExUserInfoInvenWeight(this)); } - /** - * @param open - */ - public void sendItemList(boolean open) + public void sendItemList() { - sendPacket(new ItemList(1, this, open)); - sendPacket(new ItemList(2, this, open)); + sendPacket(new ItemList(1, this)); + sendPacket(new ItemList(2, this)); sendPacket(new ExQuestItemList(1, this)); sendPacket(new ExQuestItemList(2, this)); sendPacket(new ExAdenaInvenCount(this)); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java index b36280a83c..f85059926a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java @@ -413,7 +413,7 @@ public class PcInventory extends Inventory } else { - actor.sendItemList(false); + actor.sendItemList(); } // Notify to scripts @@ -481,7 +481,7 @@ public class PcInventory extends Inventory } else { - actor.sendItemList(false); + actor.sendItemList(); } } @@ -528,7 +528,7 @@ public class PcInventory extends Inventory if ((item != null) && (actor != null)) { - actor.sendItemList(false); + actor.sendItemList(); } return item; } @@ -865,7 +865,7 @@ public class PcInventory extends Inventory _blockMode = mode; _blockItems = items; - _owner.sendItemList(false); + _owner.sendItemList(); } /** @@ -876,7 +876,7 @@ public class PcInventory extends Inventory _blockMode = InventoryBlockType.NONE; _blockItems = null; - _owner.sendItemList(false); + _owner.sendItemList(); } /** @@ -1048,7 +1048,7 @@ public class PcInventory extends Inventory { if (Config.FORCE_INVENTORY_UPDATE) { - _owner.sendItemList(false); + _owner.sendItemList(); } else { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 4839daa064..2c8f91608b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -325,8 +325,8 @@ public class EnterWorld implements IClientIncomingPacket client.sendPacket(new ExGetBookMarkInfoPacket(activeChar)); // Send Item List - client.sendPacket(new ItemList(1, activeChar, false)); - client.sendPacket(new ItemList(2, activeChar, false)); + client.sendPacket(new ItemList(1, activeChar)); + client.sendPacket(new ItemList(2, activeChar)); // Send Quest Item List client.sendPacket(new ExQuestItemList(1, activeChar)); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index 7b4a6c54b2..beab55240b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -706,7 +706,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket player.addSkill(skill, store); - player.sendItemList(false); + player.sendItemList(); player.sendPacket(new ShortCutInit(player)); player.sendPacket(new ExBasicActionList(ExBasicActionList.DEFAULT_ACTION_LIST)); player.sendSkillList(skill.getId()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuySellUIClose.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuySellUIClose.java index 2fd469d368..ccffe4bcb4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuySellUIClose.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuySellUIClose.java @@ -37,6 +37,6 @@ public class RequestBuySellUIClose implements IClientIncomingPacket return; } - activeChar.sendItemList(true); + activeChar.sendItemList(); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index cb27698f70..0beadedc6b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -203,7 +203,7 @@ public final class RequestCancelPostAttachment implements IClientIncomingPacket } else { - activeChar.sendItemList(false); + activeChar.sendItemList(); } final L2PcInstance receiver = L2World.getInstance().getPlayer(msg.getReceiverId()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 297edda360..fad57e47d2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -228,7 +228,7 @@ public final class RequestDestroyItem implements IClientIncomingPacket } else { - activeChar.sendItemList(true); + activeChar.sendItemList(); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 33c87254a1..7f2fa4f93f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -169,7 +169,7 @@ public final class RequestDropItem implements IClientIncomingPacket { activeChar.getInventory().unEquipItemInSlot(item.getLocationSlot()); activeChar.broadcastUserInfo(); - activeChar.sendItemList(true); + activeChar.sendItemList(); } final L2ItemInstance dropedItem = activeChar.dropItem("Drop", _objectId, _count, _x, _y, _z, null, false, false); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index df3944dc8a..a1127d60fa 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -490,7 +490,7 @@ public final class RequestEnchantItem implements IClientIncomingPacket } else { - activeChar.sendItemList(true); + activeChar.sendItemList(); } request.setProcessing(false); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestItemList.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestItemList.java index 419dcb9ac9..a65bc5a2a7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestItemList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestItemList.java @@ -36,7 +36,7 @@ public final class RequestItemList implements IClientIncomingPacket { if ((client != null) && (client.getActiveChar() != null) && !client.getActiveChar().isInventoryDisabled()) { - client.getActiveChar().sendItemList(true); + client.getActiveChar().sendItemList(); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 05962263f7..8b367c7d9f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -202,7 +202,7 @@ public class RequestPackageSend implements IClientIncomingPacket } else { - player.sendItemList(false); + player.sendItemList(); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 236bc251a2..d5c272d02a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -230,7 +230,7 @@ public final class RequestPostAttachment implements IClientIncomingPacket } else { - activeChar.sendItemList(false); + activeChar.sendItemList(); } msg.removeAttachments(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index e53df987df..df6fe09714 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -355,7 +355,7 @@ public final class RequestSendPost implements IClientIncomingPacket } else { - player.sendItemList(false); + player.sendItemList(); } return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 237686ac3b..75ee7e41ef 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -211,7 +211,7 @@ public final class SendWareHouseDepositList implements IClientIncomingPacket } else { - player.sendItemList(false); + player.sendItemList(); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index dc8836ed4b..b6a34a01df 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -197,7 +197,7 @@ public final class SendWareHouseWithDrawList implements IClientIncomingPacket } else { - player.sendItemList(false); + player.sendItemList(); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/ItemList.java index 567bc3e488..6be20f9e21 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -29,13 +29,11 @@ public final class ItemList extends AbstractItemPacket private final int _sendType; private final L2PcInstance _activeChar; private final List _items; - private final boolean _showWindow; - public ItemList(int sendType, L2PcInstance activeChar, boolean showWindow) + public ItemList(int sendType, L2PcInstance activeChar) { _sendType = sendType; _activeChar = activeChar; - _showWindow = showWindow; _items = activeChar.getInventory().getItems(item -> !item.isQuestItem()).stream().collect(Collectors.toList()); } @@ -55,7 +53,7 @@ public final class ItemList extends AbstractItemPacket } else { - packet.writeC(_showWindow ? 0x01 : 0x00); + packet.writeC(0x01); // _showWindow ? 0x01 : 0x00 packet.writeD(0x00); packet.writeD(_items.size()); }