From 58f30044d565dfdacdaf9191662b7cb70ee711ee Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 19 Aug 2022 22:31:14 +0000 Subject: [PATCH] Dropped ForceInventoryUpdate configuration. --- .../dist/game/config/General.ini | 6 - .../java/org/l2jmobius/Config.java | 2 - .../gameserver/model/CombatFlag.java | 15 +- .../l2jmobius/gameserver/model/TradeList.java | 22 +- .../gameserver/model/actor/Player.java | 164 ++++--------- .../model/itemcontainer/PlayerInventory.java | 39 +-- .../RequestCancelPostAttachment.java | 24 +- .../clientpackets/RequestDestroyItem.java | 17 +- .../clientpackets/RequestEnchantItem.java | 2 +- .../clientpackets/RequestPackageSend.java | 26 +- .../clientpackets/RequestPostAttachment.java | 23 +- .../clientpackets/RequestSendPost.java | 27 +-- .../SendWareHouseDepositList.java | 26 +- .../dist/game/config/General.ini | 6 - .../java/org/l2jmobius/Config.java | 2 - .../gameserver/model/CombatFlag.java | 15 +- .../l2jmobius/gameserver/model/TradeList.java | 22 +- .../gameserver/model/actor/Player.java | 164 ++++--------- .../model/itemcontainer/PlayerInventory.java | 39 +-- .../RequestCancelPostAttachment.java | 24 +- .../clientpackets/RequestDestroyItem.java | 17 +- .../clientpackets/RequestEnchantItem.java | 2 +- .../clientpackets/RequestPackageSend.java | 26 +- .../clientpackets/RequestPostAttachment.java | 23 +- .../clientpackets/RequestSendPost.java | 27 +-- .../SendWareHouseDepositList.java | 26 +- .../dist/game/config/General.ini | 6 - .../java/org/l2jmobius/Config.java | 2 - .../gameserver/model/CombatFlag.java | 15 +- .../l2jmobius/gameserver/model/TradeList.java | 22 +- .../gameserver/model/actor/Player.java | 164 ++++--------- .../model/itemcontainer/PlayerInventory.java | 39 +-- .../RequestCancelPostAttachment.java | 24 +- .../clientpackets/RequestDestroyItem.java | 17 +- .../clientpackets/RequestEnchantItem.java | 2 +- .../clientpackets/RequestPackageSend.java | 26 +- .../clientpackets/RequestPostAttachment.java | 23 +- .../clientpackets/RequestSendPost.java | 27 +-- .../SendWareHouseDepositList.java | 26 +- .../dist/game/config/General.ini | 6 - .../java/org/l2jmobius/Config.java | 2 - .../gameserver/model/CombatFlag.java | 15 +- .../l2jmobius/gameserver/model/TradeList.java | 22 +- .../gameserver/model/actor/Player.java | 164 ++++--------- .../model/itemcontainer/PlayerInventory.java | 39 +-- .../RequestCancelPostAttachment.java | 24 +- .../clientpackets/RequestDestroyItem.java | 17 +- .../clientpackets/RequestEnchantItem.java | 2 +- .../clientpackets/RequestPackageSend.java | 26 +- .../clientpackets/RequestPostAttachment.java | 23 +- .../clientpackets/RequestSendPost.java | 27 +-- .../SendWareHouseDepositList.java | 26 +- .../dist/game/config/General.ini | 6 - .../java/org/l2jmobius/Config.java | 2 - .../gameserver/model/CombatFlag.java | 15 +- .../l2jmobius/gameserver/model/TradeList.java | 24 +- .../gameserver/model/actor/Player.java | 164 ++++--------- .../model/itemcontainer/PlayerInventory.java | 39 +-- .../RequestCancelPostAttachment.java | 24 +- .../clientpackets/RequestDestroyItem.java | 17 +- .../clientpackets/RequestEnchantItem.java | 2 +- .../clientpackets/RequestPackageSend.java | 26 +- .../clientpackets/RequestPostAttachment.java | 23 +- .../clientpackets/RequestSendPost.java | 27 +-- .../SendWareHouseDepositList.java | 26 +- .../dist/game/config/General.ini | 6 - .../java/org/l2jmobius/Config.java | 2 - .../gameserver/model/CombatFlag.java | 15 +- .../l2jmobius/gameserver/model/TradeList.java | 24 +- .../gameserver/model/actor/Player.java | 164 ++++--------- .../model/itemcontainer/PlayerInventory.java | 39 +-- .../RequestCancelPostAttachment.java | 24 +- .../clientpackets/RequestDestroyItem.java | 17 +- .../clientpackets/RequestEnchantItem.java | 2 +- .../clientpackets/RequestPackageSend.java | 26 +- .../clientpackets/RequestPostAttachment.java | 23 +- .../clientpackets/RequestSendPost.java | 27 +-- .../SendWareHouseDepositList.java | 26 +- .../dist/game/config/General.ini | 6 - .../java/org/l2jmobius/Config.java | 2 - .../gameserver/model/CombatFlag.java | 15 +- .../l2jmobius/gameserver/model/TradeList.java | 24 +- .../gameserver/model/actor/Player.java | 164 ++++--------- .../model/itemcontainer/PlayerInventory.java | 39 +-- .../RequestCancelPostAttachment.java | 24 +- .../clientpackets/RequestDestroyItem.java | 17 +- .../clientpackets/RequestEnchantItem.java | 2 +- .../clientpackets/RequestPackageSend.java | 26 +- .../clientpackets/RequestPostAttachment.java | 23 +- .../clientpackets/RequestSendPost.java | 27 +-- .../SendWareHouseDepositList.java | 26 +- .../dist/game/config/General.ini | 6 - .../java/org/l2jmobius/Config.java | 2 - .../gameserver/model/CombatFlag.java | 15 +- .../l2jmobius/gameserver/model/TradeList.java | 24 +- .../gameserver/model/actor/Player.java | 164 ++++--------- .../model/itemcontainer/PlayerInventory.java | 39 +-- .../RequestCancelPostAttachment.java | 24 +- .../clientpackets/RequestDestroyItem.java | 17 +- .../clientpackets/RequestEnchantItem.java | 2 +- .../clientpackets/RequestPackageSend.java | 26 +- .../clientpackets/RequestPostAttachment.java | 23 +- .../clientpackets/RequestSendPost.java | 27 +-- .../SendWareHouseDepositList.java | 26 +- .../dist/game/config/General.ini | 6 - .../java/org/l2jmobius/Config.java | 2 - .../gameserver/model/CombatFlag.java | 15 +- .../l2jmobius/gameserver/model/TradeList.java | 24 +- .../gameserver/model/actor/Player.java | 164 ++++--------- .../model/itemcontainer/PlayerInventory.java | 39 +-- .../RequestCancelPostAttachment.java | 24 +- .../clientpackets/RequestDestroyItem.java | 17 +- .../clientpackets/RequestEnchantItem.java | 2 +- .../clientpackets/RequestPackageSend.java | 26 +- .../clientpackets/RequestPostAttachment.java | 23 +- .../clientpackets/RequestSendPost.java | 27 +-- .../SendWareHouseDepositList.java | 26 +- .../dist/game/config/General.ini | 6 - .../java/org/l2jmobius/Config.java | 2 - .../gameserver/model/CombatFlag.java | 15 +- .../l2jmobius/gameserver/model/TradeList.java | 24 +- .../gameserver/model/actor/Player.java | 164 ++++--------- .../model/itemcontainer/PlayerInventory.java | 39 +-- .../RequestCancelPostAttachment.java | 24 +- .../clientpackets/RequestDestroyItem.java | 17 +- .../clientpackets/RequestEnchantItem.java | 2 +- .../clientpackets/RequestPackageSend.java | 26 +- .../clientpackets/RequestPostAttachment.java | 23 +- .../clientpackets/RequestSendPost.java | 27 +-- .../SendWareHouseDepositList.java | 26 +- .../dist/game/config/General.ini | 6 - .../java/org/l2jmobius/Config.java | 2 - .../gameserver/model/CombatFlag.java | 15 +- .../l2jmobius/gameserver/model/TradeList.java | 24 +- .../gameserver/model/actor/Player.java | 164 ++++--------- .../model/itemcontainer/PlayerInventory.java | 39 +-- .../RequestCancelPostAttachment.java | 24 +- .../clientpackets/RequestDestroyItem.java | 17 +- .../clientpackets/RequestEnchantItem.java | 2 +- .../clientpackets/RequestPackageSend.java | 26 +- .../clientpackets/RequestPostAttachment.java | 23 +- .../clientpackets/RequestSendPost.java | 27 +-- .../SendWareHouseDepositList.java | 26 +- .../dist/game/config/General.ini | 6 - .../java/org/l2jmobius/Config.java | 2 - .../gameserver/model/CombatFlag.java | 15 +- .../l2jmobius/gameserver/model/TradeList.java | 24 +- .../gameserver/model/actor/Player.java | 164 ++++--------- .../model/itemcontainer/PlayerInventory.java | 39 +-- .../RequestCancelPostAttachment.java | 24 +- .../clientpackets/RequestDestroyItem.java | 17 +- .../clientpackets/RequestPackageSend.java | 26 +- .../clientpackets/RequestPostAttachment.java | 23 +- .../clientpackets/RequestSendPost.java | 27 +-- .../SendWareHouseDepositList.java | 26 +- .../enchant/RequestEnchantItem.java | 2 +- .../multi/ExRequestMultiEnchantItemList.java | 2 +- .../dist/game/config/General.ini | 4 - .../java/org/l2jmobius/Config.java | 2 - .../handler/skillhandlers/Charge.java | 7 +- .../handler/skillhandlers/Harvest.java | 18 +- .../handler/skillhandlers/Recall.java | 9 +- .../handler/skillhandlers/Spoil.java | 5 +- .../handler/skillhandlers/Sweep.java | 21 +- .../handler/skillhandlers/ZakenPlayer.java | 9 +- .../handler/skillhandlers/ZakenSelf.java | 9 +- .../gameserver/model/CombatFlag.java | 15 +- .../l2jmobius/gameserver/model/TradeList.java | 24 +- .../gameserver/model/actor/Player.java | 228 +++++------------- .../clientpackets/RequestCrystallizeItem.java | 38 ++- .../clientpackets/RequestDestroyItem.java | 20 +- .../clientpackets/RequestEnchantItem.java | 20 +- .../clientpackets/RequestPackageSend.java | 27 +-- .../SendWareHouseDepositList.java | 27 +-- .../SendWareHouseWithDrawList.java | 27 +-- .../dist/game/config/General.ini | 4 - .../java/org/l2jmobius/Config.java | 2 - .../handler/skillhandlers/Charge.java | 7 +- .../handler/skillhandlers/Harvest.java | 18 +- .../handler/skillhandlers/Recall.java | 9 +- .../handler/skillhandlers/Spoil.java | 5 +- .../handler/skillhandlers/Sweep.java | 21 +- .../handler/skillhandlers/ZakenPlayer.java | 9 +- .../handler/skillhandlers/ZakenSelf.java | 9 +- .../gameserver/model/CombatFlag.java | 15 +- .../l2jmobius/gameserver/model/TradeList.java | 24 +- .../gameserver/model/actor/Player.java | 228 +++++------------- .../clientpackets/RequestCrystallizeItem.java | 38 ++- .../clientpackets/RequestDestroyItem.java | 20 +- .../clientpackets/RequestEnchantItem.java | 20 +- .../clientpackets/RequestPackageSend.java | 27 +-- .../SendWareHouseDepositList.java | 27 +-- .../SendWareHouseWithDrawList.java | 27 +-- .../dist/game/config/General.ini | 6 - .../java/org/l2jmobius/Config.java | 2 - .../l2jmobius/gameserver/model/TradeList.java | 9 +- .../gameserver/model/actor/Player.java | 169 ++++--------- .../model/itemcontainer/PlayerInventory.java | 17 +- .../clientpackets/RequestDestroyItem.java | 18 +- .../clientpackets/RequestEnchantItem.java | 59 ++--- .../clientpackets/RequestPackageSend.java | 20 +- .../SendWareHouseDepositList.java | 27 +-- .../SendWareHouseWithDrawList.java | 27 +-- .../dist/game/config/General.ini | 6 - .../java/org/l2jmobius/Config.java | 2 - .../gameserver/model/CombatFlag.java | 16 +- .../gameserver/model/TerritoryWard.java | 15 +- .../l2jmobius/gameserver/model/TradeList.java | 9 +- .../gameserver/model/actor/Player.java | 169 ++++--------- .../model/itemcontainer/PlayerInventory.java | 17 +- .../RequestCancelPostAttachment.java | 24 +- .../clientpackets/RequestDestroyItem.java | 18 +- .../clientpackets/RequestEnchantItem.java | 59 ++--- .../clientpackets/RequestPackageSend.java | 20 +- .../clientpackets/RequestPostAttachment.java | 23 +- .../clientpackets/RequestSendPost.java | 28 +-- .../SendWareHouseDepositList.java | 27 +-- .../SendWareHouseWithDrawList.java | 27 +-- .../dist/game/config/General.ini | 6 - .../java/org/l2jmobius/Config.java | 2 - .../gameserver/model/CombatFlag.java | 16 +- .../gameserver/model/TerritoryWard.java | 15 +- .../l2jmobius/gameserver/model/TradeList.java | 9 +- .../gameserver/model/actor/Player.java | 169 ++++--------- .../model/itemcontainer/PlayerInventory.java | 17 +- .../RequestCancelPostAttachment.java | 24 +- .../clientpackets/RequestDestroyItem.java | 18 +- .../clientpackets/RequestEnchantItem.java | 59 ++--- .../clientpackets/RequestPackageSend.java | 20 +- .../clientpackets/RequestPostAttachment.java | 23 +- .../clientpackets/RequestSendPost.java | 28 +-- .../SendWareHouseDepositList.java | 27 +-- .../SendWareHouseWithDrawList.java | 27 +-- .../dist/game/config/General.ini | 6 - .../java/org/l2jmobius/Config.java | 2 - .../gameserver/model/CombatFlag.java | 15 +- .../l2jmobius/gameserver/model/TradeList.java | 22 +- .../gameserver/model/actor/Player.java | 164 ++++--------- .../model/itemcontainer/PlayerInventory.java | 39 +-- .../RequestCancelPostAttachment.java | 24 +- .../clientpackets/RequestDestroyItem.java | 17 +- .../clientpackets/RequestEnchantItem.java | 2 +- .../clientpackets/RequestPackageSend.java | 26 +- .../clientpackets/RequestPostAttachment.java | 23 +- .../clientpackets/RequestSendPost.java | 27 +-- .../SendWareHouseDepositList.java | 26 +- .../dist/game/config/General.ini | 6 - .../java/org/l2jmobius/Config.java | 2 - .../gameserver/model/CombatFlag.java | 15 +- .../l2jmobius/gameserver/model/TradeList.java | 22 +- .../gameserver/model/actor/Player.java | 164 ++++--------- .../model/itemcontainer/PlayerInventory.java | 39 +-- .../RequestCancelPostAttachment.java | 24 +- .../clientpackets/RequestDestroyItem.java | 17 +- .../clientpackets/RequestEnchantItem.java | 2 +- .../clientpackets/RequestPackageSend.java | 26 +- .../clientpackets/RequestPostAttachment.java | 23 +- .../clientpackets/RequestSendPost.java | 27 +-- .../SendWareHouseDepositList.java | 26 +- .../dist/game/config/General.ini | 6 - .../java/org/l2jmobius/Config.java | 2 - .../gameserver/model/CombatFlag.java | 15 +- .../l2jmobius/gameserver/model/TradeList.java | 22 +- .../gameserver/model/actor/Player.java | 164 ++++--------- .../model/itemcontainer/PlayerInventory.java | 39 +-- .../RequestCancelPostAttachment.java | 24 +- .../clientpackets/RequestDestroyItem.java | 17 +- .../clientpackets/RequestEnchantItem.java | 2 +- .../clientpackets/RequestPackageSend.java | 26 +- .../clientpackets/RequestPostAttachment.java | 23 +- .../clientpackets/RequestSendPost.java | 27 +-- .../SendWareHouseDepositList.java | 26 +- .../dist/game/config/General.ini | 6 - .../java/org/l2jmobius/Config.java | 2 - .../gameserver/model/CombatFlag.java | 15 +- .../l2jmobius/gameserver/model/TradeList.java | 22 +- .../gameserver/model/actor/Player.java | 164 ++++--------- .../model/itemcontainer/PlayerInventory.java | 39 +-- .../RequestCancelPostAttachment.java | 24 +- .../clientpackets/RequestDestroyItem.java | 17 +- .../clientpackets/RequestEnchantItem.java | 2 +- .../clientpackets/RequestPackageSend.java | 26 +- .../clientpackets/RequestPostAttachment.java | 23 +- .../clientpackets/RequestSendPost.java | 27 +-- .../SendWareHouseDepositList.java | 26 +- .../dist/game/config/General.ini | 6 - .../java/org/l2jmobius/Config.java | 2 - .../gameserver/model/CombatFlag.java | 15 +- .../l2jmobius/gameserver/model/TradeList.java | 24 +- .../gameserver/model/actor/Player.java | 164 ++++--------- .../model/itemcontainer/PlayerInventory.java | 39 +-- .../RequestCancelPostAttachment.java | 24 +- .../clientpackets/RequestDestroyItem.java | 17 +- .../clientpackets/RequestEnchantItem.java | 2 +- .../clientpackets/RequestPackageSend.java | 26 +- .../clientpackets/RequestPostAttachment.java | 23 +- .../clientpackets/RequestSendPost.java | 27 +-- .../SendWareHouseDepositList.java | 26 +- .../dist/game/config/General.ini | 6 - .../java/org/l2jmobius/Config.java | 2 - .../gameserver/model/CombatFlag.java | 15 +- .../l2jmobius/gameserver/model/TradeList.java | 24 +- .../gameserver/model/actor/Player.java | 164 ++++--------- .../model/itemcontainer/PlayerInventory.java | 39 +-- .../RequestCancelPostAttachment.java | 24 +- .../clientpackets/RequestDestroyItem.java | 17 +- .../clientpackets/RequestEnchantItem.java | 2 +- .../clientpackets/RequestPackageSend.java | 26 +- .../clientpackets/RequestPostAttachment.java | 23 +- .../clientpackets/RequestSendPost.java | 27 +-- .../SendWareHouseDepositList.java | 26 +- .../dist/game/config/General.ini | 6 - .../java/org/l2jmobius/Config.java | 2 - .../gameserver/model/CombatFlag.java | 15 +- .../l2jmobius/gameserver/model/TradeList.java | 24 +- .../gameserver/model/actor/Player.java | 164 ++++--------- .../model/itemcontainer/PlayerInventory.java | 39 +-- .../RequestCancelPostAttachment.java | 24 +- .../clientpackets/RequestDestroyItem.java | 17 +- .../clientpackets/RequestEnchantItem.java | 2 +- .../clientpackets/RequestPackageSend.java | 26 +- .../clientpackets/RequestPostAttachment.java | 23 +- .../clientpackets/RequestSendPost.java | 27 +-- .../SendWareHouseDepositList.java | 26 +- .../dist/game/config/General.ini | 6 - .../java/org/l2jmobius/Config.java | 2 - .../gameserver/model/CombatFlag.java | 15 +- .../l2jmobius/gameserver/model/TradeList.java | 24 +- .../gameserver/model/actor/Player.java | 164 ++++--------- .../model/itemcontainer/PlayerInventory.java | 39 +-- .../RequestCancelPostAttachment.java | 24 +- .../clientpackets/RequestDestroyItem.java | 17 +- .../clientpackets/RequestEnchantItem.java | 2 +- .../clientpackets/RequestPackageSend.java | 26 +- .../clientpackets/RequestPostAttachment.java | 23 +- .../clientpackets/RequestSendPost.java | 27 +-- .../SendWareHouseDepositList.java | 26 +- .../dist/game/config/General.ini | 6 - .../java/org/l2jmobius/Config.java | 2 - .../gameserver/model/CombatFlag.java | 15 +- .../l2jmobius/gameserver/model/TradeList.java | 22 +- .../gameserver/model/actor/Player.java | 164 ++++--------- .../model/itemcontainer/PlayerInventory.java | 39 +-- .../RequestCancelPostAttachment.java | 24 +- .../clientpackets/RequestDestroyItem.java | 17 +- .../clientpackets/RequestEnchantItem.java | 2 +- .../clientpackets/RequestPackageSend.java | 26 +- .../clientpackets/RequestPostAttachment.java | 23 +- .../clientpackets/RequestSendPost.java | 27 +-- .../SendWareHouseDepositList.java | 26 +- .../dist/game/config/General.ini | 6 - .../java/org/l2jmobius/Config.java | 2 - .../gameserver/model/CombatFlag.java | 15 +- .../l2jmobius/gameserver/model/TradeList.java | 24 +- .../gameserver/model/actor/Player.java | 164 ++++--------- .../model/itemcontainer/PlayerInventory.java | 39 +-- .../RequestCancelPostAttachment.java | 24 +- .../clientpackets/RequestDestroyItem.java | 17 +- .../clientpackets/RequestEnchantItem.java | 2 +- .../clientpackets/RequestPackageSend.java | 26 +- .../clientpackets/RequestPostAttachment.java | 23 +- .../clientpackets/RequestSendPost.java | 27 +-- .../SendWareHouseDepositList.java | 26 +- .../dist/game/config/General.ini | 6 - .../java/org/l2jmobius/Config.java | 2 - .../gameserver/model/CombatFlag.java | 15 +- .../l2jmobius/gameserver/model/TradeList.java | 24 +- .../gameserver/model/actor/Player.java | 164 ++++--------- .../model/itemcontainer/PlayerInventory.java | 39 +-- .../RequestCancelPostAttachment.java | 24 +- .../clientpackets/RequestDestroyItem.java | 17 +- .../clientpackets/RequestEnchantItem.java | 2 +- .../clientpackets/RequestPackageSend.java | 26 +- .../clientpackets/RequestPostAttachment.java | 23 +- .../clientpackets/RequestSendPost.java | 27 +-- .../SendWareHouseDepositList.java | 26 +- .../dist/game/config/General.ini | 6 - .../java/org/l2jmobius/Config.java | 2 - .../gameserver/model/CombatFlag.java | 15 +- .../l2jmobius/gameserver/model/TradeList.java | 24 +- .../gameserver/model/actor/Player.java | 164 ++++--------- .../model/itemcontainer/PlayerInventory.java | 39 +-- .../RequestCancelPostAttachment.java | 24 +- .../clientpackets/RequestDestroyItem.java | 17 +- .../clientpackets/RequestEnchantItem.java | 2 +- .../clientpackets/RequestPackageSend.java | 26 +- .../clientpackets/RequestPostAttachment.java | 23 +- .../clientpackets/RequestSendPost.java | 27 +-- .../SendWareHouseDepositList.java | 26 +- .../dist/game/config/General.ini | 6 - .../java/org/l2jmobius/Config.java | 2 - .../gameserver/model/CombatFlag.java | 15 +- .../l2jmobius/gameserver/model/TradeList.java | 24 +- .../gameserver/model/actor/Player.java | 164 ++++--------- .../model/itemcontainer/PlayerInventory.java | 39 +-- .../RequestCancelPostAttachment.java | 24 +- .../clientpackets/RequestDestroyItem.java | 17 +- .../clientpackets/RequestPackageSend.java | 26 +- .../clientpackets/RequestPostAttachment.java | 23 +- .../clientpackets/RequestSendPost.java | 27 +-- .../SendWareHouseDepositList.java | 26 +- .../enchant/RequestEnchantItem.java | 2 +- .../multi/ExRequestMultiEnchantItemList.java | 2 +- 403 files changed, 3443 insertions(+), 8712 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/config/General.ini b/L2J_Mobius_01.0_Ertheia/dist/game/config/General.ini index 161bb136e8..5cc2b1acba 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/config/General.ini +++ b/L2J_Mobius_01.0_Ertheia/dist/game/config/General.ini @@ -234,12 +234,6 @@ AutoDeleteInvalidQuestData = False # Default: True MultipleItemDrop = True -# Forces full item inventory packet to be sent for any item change. -# Notes: -# This can increase network traffic -# Default: False -ForceInventoryUpdate = False - # True = Load html's into cache only on first time html is requested. # False = Load all html's into cache on server startup. # Default: False diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/Config.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/Config.java index bba79e99e7..ee5568aae0 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/Config.java @@ -475,7 +475,6 @@ public class Config public static boolean ORDER_QUEST_LIST_BY_QUESTID; public static boolean AUTODELETE_INVALID_QUEST_DATA; public static boolean MULTIPLE_ITEM_DROP; - public static boolean FORCE_INVENTORY_UPDATE; public static boolean LAZY_CACHE; public static boolean CHECK_HTML_ENCODING; public static boolean CACHE_CHAR_NAMES; @@ -1988,7 +1987,6 @@ public class Config ORDER_QUEST_LIST_BY_QUESTID = generalConfig.getBoolean("OrderQuestListByQuestId", true); AUTODELETE_INVALID_QUEST_DATA = generalConfig.getBoolean("AutoDeleteInvalidQuestData", false); MULTIPLE_ITEM_DROP = generalConfig.getBoolean("MultipleItemDrop", true); - FORCE_INVENTORY_UPDATE = generalConfig.getBoolean("ForceInventoryUpdate", false); LAZY_CACHE = generalConfig.getBoolean("LazyCache", true); CHECK_HTML_ENCODING = generalConfig.getBoolean("CheckHtmlEncoding", true); CACHE_CHAR_NAMES = generalConfig.getBoolean("CacheCharNames", true); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/CombatFlag.java index 7385a9fc13..5cd007f840 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -84,16 +83,10 @@ public class CombatFlag _player.sendPacket(sm); // Refresh inventory - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_item); - _player.sendInventoryUpdate(iu); - } - else - { - _player.sendItemList(false); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_item); + _player.sendInventoryUpdate(iu); + // Refresh player stats _player.broadcastUserInfo(); _player.setCombatFlagEquipped(true); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/TradeList.java index b5e239891a..dd67b4b502 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/TradeList.java @@ -589,31 +589,17 @@ public class TradeList else { // Prepare inventory update packet - final InventoryUpdate ownerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); - final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate ownerIU = new InventoryUpdate(); + final InventoryUpdate partnerIU = new InventoryUpdate(); // Transfer items partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); // Send inventory update packet - if (ownerIU != null) - { - _owner.sendInventoryUpdate(ownerIU); - } - else - { - _owner.sendItemList(false); - } + _owner.sendInventoryUpdate(ownerIU); + _partner.sendInventoryUpdate(partnerIU); - if (partnerIU != null) - { - _partner.sendInventoryUpdate(partnerIU); - } - else - { - _partner.sendItemList(false); - } success = true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java index fe4c3531ad..ffc43d0d82 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -3082,22 +3082,15 @@ public class Player extends Playable _inventory.addAdena(process, count, this, reference); // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) + if (count == getAdena()) { - if (count == getAdena()) - { - sendItemList(false); - } - else - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addModifiedItem(_inventory.getAdenaInstance()); - sendInventoryUpdate(iu); - } + sendItemList(false); } else { - sendItemList(false); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(_inventory.getAdenaInstance()); + sendInventoryUpdate(iu); } } } @@ -3130,16 +3123,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(adenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(false); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(adenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3180,16 +3166,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(beautyTickets); - sendInventoryUpdate(iu); - } - else - { - sendItemList(false); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(beautyTickets); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3232,16 +3211,10 @@ public class Player extends Playable if (count > 0) { _inventory.addAncientAdena(process, count, this, reference); - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_inventory.getAncientAdenaInstance()); - sendInventoryUpdate(iu); - } - else - { - sendItemList(false); - } + + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_inventory.getAncientAdenaInstance()); + sendInventoryUpdate(iu); } } @@ -3272,16 +3245,9 @@ public class Player extends Playable return false; } - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(ancientAdenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(false); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(ancientAdenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3488,23 +3454,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) - { - playerIU.addModifiedItem(destoyedItem); - } - else - { - playerIU.addRemovedItem(destoyedItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(destoyedItem); } else { - sendItemList(false); + playerIU.addRemovedItem(destoyedItem); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3604,23 +3563,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > 0)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addRemovedItem(item); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - sendItemList(false); + playerIU.addRemovedItem(item); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3666,45 +3618,31 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(oldItem); } else { - sendItemList(false); + playerIU.addRemovedItem(oldItem); } + sendInventoryUpdate(playerIU); // Send target update packet if (target instanceof PlayerInventory) { final Player targetPlayer = ((PlayerInventory) target).getOwner(); - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate targetIU = new InventoryUpdate(); + if (newItem.getCount() > count) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (newItem.getCount() > count) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } - targetPlayer.sendPacket(playerIU); + targetIU.addModifiedItem(newItem); } else { - targetPlayer.sendItemList(false); + targetIU.addNewItem(newItem); } + targetPlayer.sendPacket(targetIU); } else if (target instanceof PetInventory) { @@ -3807,16 +3745,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(droppedItem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(false); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(droppedItem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3881,16 +3812,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(invitem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(false); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(invitem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 6e1627d024..c5a1ad58f5 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -417,16 +417,9 @@ public class PlayerInventory extends Inventory if (actor != null) { // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(addedItem); - actor.sendInventoryUpdate(playerIU); - } - else - { - actor.sendItemList(false); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(addedItem); + actor.sendInventoryUpdate(playerIU); // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getTemplate()); @@ -483,23 +476,16 @@ public class PlayerInventory extends Inventory // Send inventory update packet if (update) { - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > count)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > count)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addNewItem(item); - } - actor.sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - actor.sendItemList(false); + playerIU.addNewItem(item); } + actor.sendInventoryUpdate(playerIU); } // Notify to scripts @@ -1095,14 +1081,7 @@ public class PlayerInventory extends Inventory } finally { - if (Config.FORCE_INVENTORY_UPDATE) - { - _owner.sendItemList(false); - } - else - { - _owner.sendInventoryUpdate(iu); - } + _owner.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 3954ae70e6..8112d3b2b0 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -161,7 +161,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -176,17 +176,15 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); } + else + { + playerIU.addNewItem(newItem); + } + final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); sm.addItemName(item.getId()); sm.addLong(count); @@ -196,10 +194,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket msg.removeAttachments(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(false); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 717ac43807..0cb418fbf3 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -207,22 +207,15 @@ public class RequestDestroyItem implements IClientIncomingPacket return; } - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate iu = new InventoryUpdate(); + if (removedItem.getCount() == 0) { - final InventoryUpdate iu = new InventoryUpdate(); - if (removedItem.getCount() == 0) - { - iu.addRemovedItem(removedItem); - } - else - { - iu.addModifiedItem(removedItem); - } - player.sendInventoryUpdate(iu); + iu.addRemovedItem(removedItem); } else { - player.sendItemList(true); + iu.addModifiedItem(removedItem); } + player.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 473a5ba5ef..adcda42afa 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -400,7 +400,7 @@ public class RequestEnchantItem implements IClientIncomingPacket player.sendPacket(sm); } - if (!Config.FORCE_INVENTORY_UPDATE && (crystals != null)) + if (crystals != null) { iu.addItem(crystals); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 7570e3e5e2..6b247a4044 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -163,7 +163,7 @@ public class RequestPackageSend implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder i : _items) { // Check validity of requested item @@ -182,16 +182,13 @@ public class RequestPackageSend implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } // Remove item objects from the world. @@ -202,13 +199,6 @@ public class RequestPackageSend implements IClientIncomingPacket warehouse.deleteMe(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(false); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index bd00745002..77341ce68d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -184,7 +184,7 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -205,16 +205,13 @@ public class RequestPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); + } + else + { + playerIU.addNewItem(newItem); } final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); @@ -224,10 +221,8 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(false); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 5014c0b7d0..eb47cc8375 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -310,7 +310,7 @@ public class RequestSendPost implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (AttachmentItem i : _items) { // Check validity of requested item @@ -328,28 +328,19 @@ public class RequestSendPost implements IClientIncomingPacket continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); - if (playerIU != null) + + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(false); - } + player.sendInventoryUpdate(playerIU); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index b332fd9707..8e354c0c64 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -168,7 +168,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder itemHolder : _items) { // Check validity of requested item @@ -191,27 +191,17 @@ public class SendWareHouseDepositList implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(false); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_02.5_Underground/dist/game/config/General.ini b/L2J_Mobius_02.5_Underground/dist/game/config/General.ini index d9539820d8..a3023abbee 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/config/General.ini +++ b/L2J_Mobius_02.5_Underground/dist/game/config/General.ini @@ -242,12 +242,6 @@ ExaltedForHonorItemMax = 45873,100 # Default: True MultipleItemDrop = True -# Forces full item inventory packet to be sent for any item change. -# Notes: -# This can increase network traffic -# Default: False -ForceInventoryUpdate = False - # True = Load html's into cache only on first time html is requested. # False = Load all html's into cache on server startup. # Default: False diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/Config.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/Config.java index 2e4dea14d5..0729c860da 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/Config.java @@ -485,7 +485,6 @@ public class Config public static ItemHolder EXALTED_FOR_GLORY_ITEM_MAX; public static ItemHolder EXALTED_FOR_HONOR_ITEM_MAX; public static boolean MULTIPLE_ITEM_DROP; - public static boolean FORCE_INVENTORY_UPDATE; public static boolean LAZY_CACHE; public static boolean CHECK_HTML_ENCODING; public static boolean CACHE_CHAR_NAMES; @@ -2012,7 +2011,6 @@ public class Config EXALTED_FOR_GLORY_ITEM_MAX = new ItemHolder(Integer.parseInt(generalConfig.getString("ExaltedForGloryItemMax", "45872,80").split(",")[0]), Integer.parseInt(generalConfig.getString("ExaltedForGloryItemMax", "45872,80").split(",")[1])); EXALTED_FOR_HONOR_ITEM_MAX = new ItemHolder(Integer.parseInt(generalConfig.getString("ExaltedForHonorItemMax", "45873,100").split(",")[0]), Integer.parseInt(generalConfig.getString("ExaltedForHonorItemMax", "45873,100").split(",")[1])); MULTIPLE_ITEM_DROP = generalConfig.getBoolean("MultipleItemDrop", true); - FORCE_INVENTORY_UPDATE = generalConfig.getBoolean("ForceInventoryUpdate", false); LAZY_CACHE = generalConfig.getBoolean("LazyCache", true); CHECK_HTML_ENCODING = generalConfig.getBoolean("CheckHtmlEncoding", true); CACHE_CHAR_NAMES = generalConfig.getBoolean("CacheCharNames", true); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/CombatFlag.java index 7385a9fc13..5cd007f840 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -84,16 +83,10 @@ public class CombatFlag _player.sendPacket(sm); // Refresh inventory - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_item); - _player.sendInventoryUpdate(iu); - } - else - { - _player.sendItemList(false); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_item); + _player.sendInventoryUpdate(iu); + // Refresh player stats _player.broadcastUserInfo(); _player.setCombatFlagEquipped(true); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/TradeList.java index b5e239891a..dd67b4b502 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/TradeList.java @@ -589,31 +589,17 @@ public class TradeList else { // Prepare inventory update packet - final InventoryUpdate ownerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); - final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate ownerIU = new InventoryUpdate(); + final InventoryUpdate partnerIU = new InventoryUpdate(); // Transfer items partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); // Send inventory update packet - if (ownerIU != null) - { - _owner.sendInventoryUpdate(ownerIU); - } - else - { - _owner.sendItemList(false); - } + _owner.sendInventoryUpdate(ownerIU); + _partner.sendInventoryUpdate(partnerIU); - if (partnerIU != null) - { - _partner.sendInventoryUpdate(partnerIU); - } - else - { - _partner.sendItemList(false); - } success = true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java index 3426b1fe6c..be95f04f05 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -3084,22 +3084,15 @@ public class Player extends Playable _inventory.addAdena(process, count, this, reference); // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) + if (count == getAdena()) { - if (count == getAdena()) - { - sendItemList(false); - } - else - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addModifiedItem(_inventory.getAdenaInstance()); - sendInventoryUpdate(iu); - } + sendItemList(false); } else { - sendItemList(false); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(_inventory.getAdenaInstance()); + sendInventoryUpdate(iu); } } } @@ -3132,16 +3125,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(adenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(false); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(adenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3182,16 +3168,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(beautyTickets); - sendInventoryUpdate(iu); - } - else - { - sendItemList(false); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(beautyTickets); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3234,16 +3213,10 @@ public class Player extends Playable if (count > 0) { _inventory.addAncientAdena(process, count, this, reference); - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_inventory.getAncientAdenaInstance()); - sendInventoryUpdate(iu); - } - else - { - sendItemList(false); - } + + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_inventory.getAncientAdenaInstance()); + sendInventoryUpdate(iu); } } @@ -3274,16 +3247,9 @@ public class Player extends Playable return false; } - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(ancientAdenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(false); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(ancientAdenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3490,23 +3456,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) - { - playerIU.addModifiedItem(destoyedItem); - } - else - { - playerIU.addRemovedItem(destoyedItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(destoyedItem); } else { - sendItemList(false); + playerIU.addRemovedItem(destoyedItem); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3606,23 +3565,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > 0)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addRemovedItem(item); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - sendItemList(false); + playerIU.addRemovedItem(item); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3668,45 +3620,31 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(oldItem); } else { - sendItemList(false); + playerIU.addRemovedItem(oldItem); } + sendInventoryUpdate(playerIU); // Send target update packet if (target instanceof PlayerInventory) { final Player targetPlayer = ((PlayerInventory) target).getOwner(); - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate targetIU = new InventoryUpdate(); + if (newItem.getCount() > count) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (newItem.getCount() > count) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } - targetPlayer.sendPacket(playerIU); + targetIU.addModifiedItem(newItem); } else { - targetPlayer.sendItemList(false); + targetIU.addNewItem(newItem); } + targetPlayer.sendPacket(targetIU); } else if (target instanceof PetInventory) { @@ -3809,16 +3747,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(droppedItem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(false); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(droppedItem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3883,16 +3814,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(invitem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(false); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(invitem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index d3029c7223..eabca3a196 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -417,16 +417,9 @@ public class PlayerInventory extends Inventory if (actor != null) { // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(addedItem); - actor.sendInventoryUpdate(playerIU); - } - else - { - actor.sendItemList(false); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(addedItem); + actor.sendInventoryUpdate(playerIU); // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getTemplate()); @@ -483,23 +476,16 @@ public class PlayerInventory extends Inventory // Send inventory update packet if (update) { - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > count)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > count)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addNewItem(item); - } - actor.sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - actor.sendItemList(false); + playerIU.addNewItem(item); } + actor.sendInventoryUpdate(playerIU); } // Notify to scripts @@ -1099,14 +1085,7 @@ public class PlayerInventory extends Inventory } finally { - if (Config.FORCE_INVENTORY_UPDATE) - { - _owner.sendItemList(false); - } - else - { - _owner.sendInventoryUpdate(iu); - } + _owner.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 3954ae70e6..8112d3b2b0 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -161,7 +161,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -176,17 +176,15 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); } + else + { + playerIU.addNewItem(newItem); + } + final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); sm.addItemName(item.getId()); sm.addLong(count); @@ -196,10 +194,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket msg.removeAttachments(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(false); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 717ac43807..0cb418fbf3 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -207,22 +207,15 @@ public class RequestDestroyItem implements IClientIncomingPacket return; } - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate iu = new InventoryUpdate(); + if (removedItem.getCount() == 0) { - final InventoryUpdate iu = new InventoryUpdate(); - if (removedItem.getCount() == 0) - { - iu.addRemovedItem(removedItem); - } - else - { - iu.addModifiedItem(removedItem); - } - player.sendInventoryUpdate(iu); + iu.addRemovedItem(removedItem); } else { - player.sendItemList(true); + iu.addModifiedItem(removedItem); } + player.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 2fe1117405..9e0f85e1ae 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -400,7 +400,7 @@ public class RequestEnchantItem implements IClientIncomingPacket player.sendPacket(sm); } - if (!Config.FORCE_INVENTORY_UPDATE && (crystals != null)) + if (crystals != null) { iu.addItem(crystals); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 7570e3e5e2..6b247a4044 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -163,7 +163,7 @@ public class RequestPackageSend implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder i : _items) { // Check validity of requested item @@ -182,16 +182,13 @@ public class RequestPackageSend implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } // Remove item objects from the world. @@ -202,13 +199,6 @@ public class RequestPackageSend implements IClientIncomingPacket warehouse.deleteMe(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(false); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index bd00745002..77341ce68d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -184,7 +184,7 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -205,16 +205,13 @@ public class RequestPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); + } + else + { + playerIU.addNewItem(newItem); } final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); @@ -224,10 +221,8 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(false); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 5014c0b7d0..eb47cc8375 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -310,7 +310,7 @@ public class RequestSendPost implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (AttachmentItem i : _items) { // Check validity of requested item @@ -328,28 +328,19 @@ public class RequestSendPost implements IClientIncomingPacket continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); - if (playerIU != null) + + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(false); - } + player.sendInventoryUpdate(playerIU); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index b332fd9707..8e354c0c64 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -168,7 +168,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder itemHolder : _items) { // Check validity of requested item @@ -191,27 +191,17 @@ public class SendWareHouseDepositList implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(false); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_03.0_Helios/dist/game/config/General.ini b/L2J_Mobius_03.0_Helios/dist/game/config/General.ini index d9539820d8..a3023abbee 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/config/General.ini +++ b/L2J_Mobius_03.0_Helios/dist/game/config/General.ini @@ -242,12 +242,6 @@ ExaltedForHonorItemMax = 45873,100 # Default: True MultipleItemDrop = True -# Forces full item inventory packet to be sent for any item change. -# Notes: -# This can increase network traffic -# Default: False -ForceInventoryUpdate = False - # True = Load html's into cache only on first time html is requested. # False = Load all html's into cache on server startup. # Default: False diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/Config.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/Config.java index aef3472cc4..16ffb8e9a6 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/Config.java @@ -485,7 +485,6 @@ public class Config public static ItemHolder EXALTED_FOR_GLORY_ITEM_MAX; public static ItemHolder EXALTED_FOR_HONOR_ITEM_MAX; public static boolean MULTIPLE_ITEM_DROP; - public static boolean FORCE_INVENTORY_UPDATE; public static boolean LAZY_CACHE; public static boolean CHECK_HTML_ENCODING; public static boolean CACHE_CHAR_NAMES; @@ -2025,7 +2024,6 @@ public class Config EXALTED_FOR_GLORY_ITEM_MAX = new ItemHolder(Integer.parseInt(generalConfig.getString("ExaltedForGloryItemMax", "45872,80").split(",")[0]), Integer.parseInt(generalConfig.getString("ExaltedForGloryItemMax", "45872,80").split(",")[1])); EXALTED_FOR_HONOR_ITEM_MAX = new ItemHolder(Integer.parseInt(generalConfig.getString("ExaltedForHonorItemMax", "45873,100").split(",")[0]), Integer.parseInt(generalConfig.getString("ExaltedForHonorItemMax", "45873,100").split(",")[1])); MULTIPLE_ITEM_DROP = generalConfig.getBoolean("MultipleItemDrop", true); - FORCE_INVENTORY_UPDATE = generalConfig.getBoolean("ForceInventoryUpdate", false); LAZY_CACHE = generalConfig.getBoolean("LazyCache", true); CHECK_HTML_ENCODING = generalConfig.getBoolean("CheckHtmlEncoding", true); CACHE_CHAR_NAMES = generalConfig.getBoolean("CacheCharNames", true); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/CombatFlag.java index 7385a9fc13..5cd007f840 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -84,16 +83,10 @@ public class CombatFlag _player.sendPacket(sm); // Refresh inventory - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_item); - _player.sendInventoryUpdate(iu); - } - else - { - _player.sendItemList(false); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_item); + _player.sendInventoryUpdate(iu); + // Refresh player stats _player.broadcastUserInfo(); _player.setCombatFlagEquipped(true); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/TradeList.java index b5e239891a..dd67b4b502 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/TradeList.java @@ -589,31 +589,17 @@ public class TradeList else { // Prepare inventory update packet - final InventoryUpdate ownerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); - final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate ownerIU = new InventoryUpdate(); + final InventoryUpdate partnerIU = new InventoryUpdate(); // Transfer items partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); // Send inventory update packet - if (ownerIU != null) - { - _owner.sendInventoryUpdate(ownerIU); - } - else - { - _owner.sendItemList(false); - } + _owner.sendInventoryUpdate(ownerIU); + _partner.sendInventoryUpdate(partnerIU); - if (partnerIU != null) - { - _partner.sendInventoryUpdate(partnerIU); - } - else - { - _partner.sendItemList(false); - } success = true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java index 1aeeb36423..483e7801a7 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -3086,22 +3086,15 @@ public class Player extends Playable _inventory.addAdena(process, count, this, reference); // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) + if (count == getAdena()) { - if (count == getAdena()) - { - sendItemList(false); - } - else - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addModifiedItem(_inventory.getAdenaInstance()); - sendInventoryUpdate(iu); - } + sendItemList(false); } else { - sendItemList(false); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(_inventory.getAdenaInstance()); + sendInventoryUpdate(iu); } } } @@ -3134,16 +3127,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(adenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(false); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(adenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3184,16 +3170,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(beautyTickets); - sendInventoryUpdate(iu); - } - else - { - sendItemList(false); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(beautyTickets); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3236,16 +3215,10 @@ public class Player extends Playable if (count > 0) { _inventory.addAncientAdena(process, count, this, reference); - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_inventory.getAncientAdenaInstance()); - sendInventoryUpdate(iu); - } - else - { - sendItemList(false); - } + + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_inventory.getAncientAdenaInstance()); + sendInventoryUpdate(iu); } } @@ -3276,16 +3249,9 @@ public class Player extends Playable return false; } - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(ancientAdenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(false); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(ancientAdenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3492,23 +3458,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) - { - playerIU.addModifiedItem(destoyedItem); - } - else - { - playerIU.addRemovedItem(destoyedItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(destoyedItem); } else { - sendItemList(false); + playerIU.addRemovedItem(destoyedItem); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3608,23 +3567,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > 0)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addRemovedItem(item); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - sendItemList(false); + playerIU.addRemovedItem(item); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3670,45 +3622,31 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(oldItem); } else { - sendItemList(false); + playerIU.addRemovedItem(oldItem); } + sendInventoryUpdate(playerIU); // Send target update packet if (target instanceof PlayerInventory) { final Player targetPlayer = ((PlayerInventory) target).getOwner(); - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate targetIU = new InventoryUpdate(); + if (newItem.getCount() > count) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (newItem.getCount() > count) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } - targetPlayer.sendPacket(playerIU); + targetIU.addModifiedItem(newItem); } else { - targetPlayer.sendItemList(false); + targetIU.addNewItem(newItem); } + targetPlayer.sendPacket(targetIU); } else if (target instanceof PetInventory) { @@ -3811,16 +3749,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(droppedItem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(false); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(droppedItem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3885,16 +3816,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(invitem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(false); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(invitem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index d3029c7223..eabca3a196 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -417,16 +417,9 @@ public class PlayerInventory extends Inventory if (actor != null) { // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(addedItem); - actor.sendInventoryUpdate(playerIU); - } - else - { - actor.sendItemList(false); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(addedItem); + actor.sendInventoryUpdate(playerIU); // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getTemplate()); @@ -483,23 +476,16 @@ public class PlayerInventory extends Inventory // Send inventory update packet if (update) { - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > count)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > count)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addNewItem(item); - } - actor.sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - actor.sendItemList(false); + playerIU.addNewItem(item); } + actor.sendInventoryUpdate(playerIU); } // Notify to scripts @@ -1099,14 +1085,7 @@ public class PlayerInventory extends Inventory } finally { - if (Config.FORCE_INVENTORY_UPDATE) - { - _owner.sendItemList(false); - } - else - { - _owner.sendInventoryUpdate(iu); - } + _owner.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 3954ae70e6..8112d3b2b0 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -161,7 +161,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -176,17 +176,15 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); } + else + { + playerIU.addNewItem(newItem); + } + final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); sm.addItemName(item.getId()); sm.addLong(count); @@ -196,10 +194,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket msg.removeAttachments(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(false); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 717ac43807..0cb418fbf3 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -207,22 +207,15 @@ public class RequestDestroyItem implements IClientIncomingPacket return; } - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate iu = new InventoryUpdate(); + if (removedItem.getCount() == 0) { - final InventoryUpdate iu = new InventoryUpdate(); - if (removedItem.getCount() == 0) - { - iu.addRemovedItem(removedItem); - } - else - { - iu.addModifiedItem(removedItem); - } - player.sendInventoryUpdate(iu); + iu.addRemovedItem(removedItem); } else { - player.sendItemList(true); + iu.addModifiedItem(removedItem); } + player.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 2fe1117405..9e0f85e1ae 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -400,7 +400,7 @@ public class RequestEnchantItem implements IClientIncomingPacket player.sendPacket(sm); } - if (!Config.FORCE_INVENTORY_UPDATE && (crystals != null)) + if (crystals != null) { iu.addItem(crystals); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 7570e3e5e2..6b247a4044 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -163,7 +163,7 @@ public class RequestPackageSend implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder i : _items) { // Check validity of requested item @@ -182,16 +182,13 @@ public class RequestPackageSend implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } // Remove item objects from the world. @@ -202,13 +199,6 @@ public class RequestPackageSend implements IClientIncomingPacket warehouse.deleteMe(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(false); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index bd00745002..77341ce68d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -184,7 +184,7 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -205,16 +205,13 @@ public class RequestPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); + } + else + { + playerIU.addNewItem(newItem); } final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); @@ -224,10 +221,8 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(false); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 5014c0b7d0..eb47cc8375 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -310,7 +310,7 @@ public class RequestSendPost implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (AttachmentItem i : _items) { // Check validity of requested item @@ -328,28 +328,19 @@ public class RequestSendPost implements IClientIncomingPacket continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); - if (playerIU != null) + + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(false); - } + player.sendInventoryUpdate(playerIU); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index b332fd9707..8e354c0c64 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -168,7 +168,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder itemHolder : _items) { // Check validity of requested item @@ -191,27 +191,17 @@ public class SendWareHouseDepositList implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(false); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/config/General.ini b/L2J_Mobius_04.0_GrandCrusade/dist/game/config/General.ini index d9539820d8..a3023abbee 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/config/General.ini +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/config/General.ini @@ -242,12 +242,6 @@ ExaltedForHonorItemMax = 45873,100 # Default: True MultipleItemDrop = True -# Forces full item inventory packet to be sent for any item change. -# Notes: -# This can increase network traffic -# Default: False -ForceInventoryUpdate = False - # True = Load html's into cache only on first time html is requested. # False = Load all html's into cache on server startup. # Default: False diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/Config.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/Config.java index 9084aa319d..34fec51483 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/Config.java @@ -479,7 +479,6 @@ public class Config public static ItemHolder EXALTED_FOR_GLORY_ITEM_MAX; public static ItemHolder EXALTED_FOR_HONOR_ITEM_MAX; public static boolean MULTIPLE_ITEM_DROP; - public static boolean FORCE_INVENTORY_UPDATE; public static boolean LAZY_CACHE; public static boolean CHECK_HTML_ENCODING; public static boolean CACHE_CHAR_NAMES; @@ -2005,7 +2004,6 @@ public class Config EXALTED_FOR_GLORY_ITEM_MAX = new ItemHolder(Integer.parseInt(generalConfig.getString("ExaltedForGloryItemMax", "45872,80").split(",")[0]), Integer.parseInt(generalConfig.getString("ExaltedForGloryItemMax", "45872,80").split(",")[1])); EXALTED_FOR_HONOR_ITEM_MAX = new ItemHolder(Integer.parseInt(generalConfig.getString("ExaltedForHonorItemMax", "45873,100").split(",")[0]), Integer.parseInt(generalConfig.getString("ExaltedForHonorItemMax", "45873,100").split(",")[1])); MULTIPLE_ITEM_DROP = generalConfig.getBoolean("MultipleItemDrop", true); - FORCE_INVENTORY_UPDATE = generalConfig.getBoolean("ForceInventoryUpdate", false); LAZY_CACHE = generalConfig.getBoolean("LazyCache", true); CHECK_HTML_ENCODING = generalConfig.getBoolean("CheckHtmlEncoding", true); CACHE_CHAR_NAMES = generalConfig.getBoolean("CacheCharNames", true); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/CombatFlag.java index 7385a9fc13..5cd007f840 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -84,16 +83,10 @@ public class CombatFlag _player.sendPacket(sm); // Refresh inventory - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_item); - _player.sendInventoryUpdate(iu); - } - else - { - _player.sendItemList(false); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_item); + _player.sendInventoryUpdate(iu); + // Refresh player stats _player.broadcastUserInfo(); _player.setCombatFlagEquipped(true); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TradeList.java index 6f2dc0bcd2..97554769e1 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TradeList.java @@ -591,31 +591,17 @@ public class TradeList else { // Prepare inventory update packet - final InventoryUpdate ownerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); - final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate ownerIU = new InventoryUpdate(); + final InventoryUpdate partnerIU = new InventoryUpdate(); // Transfer items partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); // Send inventory update packet - if (ownerIU != null) - { - _owner.sendInventoryUpdate(ownerIU); - } - else - { - _owner.sendItemList(false); - } + _owner.sendInventoryUpdate(ownerIU); + _partner.sendInventoryUpdate(partnerIU); - if (partnerIU != null) - { - _partner.sendInventoryUpdate(partnerIU); - } - else - { - _partner.sendItemList(false); - } success = true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java index 8c8009fe25..11c9b066a7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -3082,22 +3082,15 @@ public class Player extends Playable _inventory.addAdena(process, count, this, reference); // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) + if (count == getAdena()) { - if (count == getAdena()) - { - sendItemList(false); - } - else - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addModifiedItem(_inventory.getAdenaInstance()); - sendInventoryUpdate(iu); - } + sendItemList(false); } else { - sendItemList(false); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(_inventory.getAdenaInstance()); + sendInventoryUpdate(iu); } } } @@ -3130,16 +3123,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(adenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(false); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(adenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3180,16 +3166,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(beautyTickets); - sendInventoryUpdate(iu); - } - else - { - sendItemList(false); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(beautyTickets); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3232,16 +3211,10 @@ public class Player extends Playable if (count > 0) { _inventory.addAncientAdena(process, count, this, reference); - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_inventory.getAncientAdenaInstance()); - sendInventoryUpdate(iu); - } - else - { - sendItemList(false); - } + + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_inventory.getAncientAdenaInstance()); + sendInventoryUpdate(iu); } } @@ -3272,16 +3245,9 @@ public class Player extends Playable return false; } - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(ancientAdenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(false); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(ancientAdenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3488,23 +3454,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) - { - playerIU.addModifiedItem(destoyedItem); - } - else - { - playerIU.addRemovedItem(destoyedItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(destoyedItem); } else { - sendItemList(false); + playerIU.addRemovedItem(destoyedItem); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3604,23 +3563,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > 0)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addRemovedItem(item); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - sendItemList(false); + playerIU.addRemovedItem(item); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3666,45 +3618,31 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(oldItem); } else { - sendItemList(false); + playerIU.addRemovedItem(oldItem); } + sendInventoryUpdate(playerIU); // Send target update packet if (target instanceof PlayerInventory) { final Player targetPlayer = ((PlayerInventory) target).getOwner(); - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate targetIU = new InventoryUpdate(); + if (newItem.getCount() > count) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (newItem.getCount() > count) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } - targetPlayer.sendPacket(playerIU); + targetIU.addModifiedItem(newItem); } else { - targetPlayer.sendItemList(false); + targetIU.addNewItem(newItem); } + targetPlayer.sendPacket(targetIU); } else if (target instanceof PetInventory) { @@ -3807,16 +3745,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(droppedItem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(false); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(droppedItem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3881,16 +3812,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(invitem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(false); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(invitem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index d3029c7223..eabca3a196 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -417,16 +417,9 @@ public class PlayerInventory extends Inventory if (actor != null) { // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(addedItem); - actor.sendInventoryUpdate(playerIU); - } - else - { - actor.sendItemList(false); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(addedItem); + actor.sendInventoryUpdate(playerIU); // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getTemplate()); @@ -483,23 +476,16 @@ public class PlayerInventory extends Inventory // Send inventory update packet if (update) { - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > count)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > count)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addNewItem(item); - } - actor.sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - actor.sendItemList(false); + playerIU.addNewItem(item); } + actor.sendInventoryUpdate(playerIU); } // Notify to scripts @@ -1099,14 +1085,7 @@ public class PlayerInventory extends Inventory } finally { - if (Config.FORCE_INVENTORY_UPDATE) - { - _owner.sendItemList(false); - } - else - { - _owner.sendInventoryUpdate(iu); - } + _owner.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 3954ae70e6..8112d3b2b0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -161,7 +161,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -176,17 +176,15 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); } + else + { + playerIU.addNewItem(newItem); + } + final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); sm.addItemName(item.getId()); sm.addLong(count); @@ -196,10 +194,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket msg.removeAttachments(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(false); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 717ac43807..0cb418fbf3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -207,22 +207,15 @@ public class RequestDestroyItem implements IClientIncomingPacket return; } - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate iu = new InventoryUpdate(); + if (removedItem.getCount() == 0) { - final InventoryUpdate iu = new InventoryUpdate(); - if (removedItem.getCount() == 0) - { - iu.addRemovedItem(removedItem); - } - else - { - iu.addModifiedItem(removedItem); - } - player.sendInventoryUpdate(iu); + iu.addRemovedItem(removedItem); } else { - player.sendItemList(true); + iu.addModifiedItem(removedItem); } + player.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index b8f37f22bc..54f518ec16 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -401,7 +401,7 @@ public class RequestEnchantItem implements IClientIncomingPacket player.sendPacket(sm); } - if (!Config.FORCE_INVENTORY_UPDATE && (crystals != null)) + if (crystals != null) { iu.addItem(crystals); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 7570e3e5e2..6b247a4044 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -163,7 +163,7 @@ public class RequestPackageSend implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder i : _items) { // Check validity of requested item @@ -182,16 +182,13 @@ public class RequestPackageSend implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } // Remove item objects from the world. @@ -202,13 +199,6 @@ public class RequestPackageSend implements IClientIncomingPacket warehouse.deleteMe(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(false); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index bd00745002..77341ce68d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -184,7 +184,7 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -205,16 +205,13 @@ public class RequestPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); + } + else + { + playerIU.addNewItem(newItem); } final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); @@ -224,10 +221,8 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(false); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 5014c0b7d0..eb47cc8375 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -310,7 +310,7 @@ public class RequestSendPost implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (AttachmentItem i : _items) { // Check validity of requested item @@ -328,28 +328,19 @@ public class RequestSendPost implements IClientIncomingPacket continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); - if (playerIU != null) + + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(false); - } + player.sendInventoryUpdate(playerIU); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index b332fd9707..8e354c0c64 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -168,7 +168,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder itemHolder : _items) { // Check validity of requested item @@ -191,27 +191,17 @@ public class SendWareHouseDepositList implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(false); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/config/General.ini b/L2J_Mobius_05.0_Salvation/dist/game/config/General.ini index d9539820d8..a3023abbee 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/config/General.ini +++ b/L2J_Mobius_05.0_Salvation/dist/game/config/General.ini @@ -242,12 +242,6 @@ ExaltedForHonorItemMax = 45873,100 # Default: True MultipleItemDrop = True -# Forces full item inventory packet to be sent for any item change. -# Notes: -# This can increase network traffic -# Default: False -ForceInventoryUpdate = False - # True = Load html's into cache only on first time html is requested. # False = Load all html's into cache on server startup. # Default: False diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/Config.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/Config.java index fd2cd8987b..027601cd73 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/Config.java @@ -478,7 +478,6 @@ public class Config public static ItemHolder EXALTED_FOR_GLORY_ITEM_MAX; public static ItemHolder EXALTED_FOR_HONOR_ITEM_MAX; public static boolean MULTIPLE_ITEM_DROP; - public static boolean FORCE_INVENTORY_UPDATE; public static boolean LAZY_CACHE; public static boolean CHECK_HTML_ENCODING; public static boolean CACHE_CHAR_NAMES; @@ -2014,7 +2013,6 @@ public class Config EXALTED_FOR_GLORY_ITEM_MAX = new ItemHolder(Integer.parseInt(generalConfig.getString("ExaltedForGloryItemMax", "45872,80").split(",")[0]), Integer.parseInt(generalConfig.getString("ExaltedForGloryItemMax", "45872,80").split(",")[1])); EXALTED_FOR_HONOR_ITEM_MAX = new ItemHolder(Integer.parseInt(generalConfig.getString("ExaltedForHonorItemMax", "45873,100").split(",")[0]), Integer.parseInt(generalConfig.getString("ExaltedForHonorItemMax", "45873,100").split(",")[1])); MULTIPLE_ITEM_DROP = generalConfig.getBoolean("MultipleItemDrop", true); - FORCE_INVENTORY_UPDATE = generalConfig.getBoolean("ForceInventoryUpdate", false); LAZY_CACHE = generalConfig.getBoolean("LazyCache", true); CHECK_HTML_ENCODING = generalConfig.getBoolean("CheckHtmlEncoding", true); CACHE_CHAR_NAMES = generalConfig.getBoolean("CacheCharNames", true); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/CombatFlag.java index 319f20ea33..14b7228207 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -84,16 +83,10 @@ public class CombatFlag _player.sendPacket(sm); // Refresh inventory - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_item); - _player.sendInventoryUpdate(iu); - } - else - { - _player.sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_item); + _player.sendInventoryUpdate(iu); + // Refresh player stats _player.broadcastUserInfo(); _player.setCombatFlagEquipped(true); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/TradeList.java index 531d70d789..0cb8de3cc5 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/TradeList.java @@ -591,31 +591,17 @@ public class TradeList else { // Prepare inventory update packet - final InventoryUpdate ownerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); - final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate ownerIU = new InventoryUpdate(); + final InventoryUpdate partnerIU = new InventoryUpdate(); // Transfer items partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); - // Send inventory update packet - if (ownerIU != null) - { - _owner.sendInventoryUpdate(ownerIU); - } - else - { - _owner.sendItemList(); - } + // Send inventory update packets + _owner.sendInventoryUpdate(ownerIU); + _partner.sendInventoryUpdate(partnerIU); - if (partnerIU != null) - { - _partner.sendInventoryUpdate(partnerIU); - } - else - { - _partner.sendItemList(); - } success = true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java index 8770fdaec4..5c937b61cc 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -3112,22 +3112,15 @@ public class Player extends Playable _inventory.addAdena(process, count, this, reference); // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) + if (count == getAdena()) { - if (count == getAdena()) - { - sendItemList(); - } - else - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addModifiedItem(_inventory.getAdenaInstance()); - sendInventoryUpdate(iu); - } + sendItemList(); } else { - sendItemList(); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(_inventory.getAdenaInstance()); + sendInventoryUpdate(iu); } } } @@ -3160,16 +3153,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(adenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(adenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3210,16 +3196,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(beautyTickets); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(beautyTickets); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3262,16 +3241,10 @@ public class Player extends Playable if (count > 0) { _inventory.addAncientAdena(process, count, this, reference); - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_inventory.getAncientAdenaInstance()); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_inventory.getAncientAdenaInstance()); + sendInventoryUpdate(iu); } } @@ -3302,16 +3275,9 @@ public class Player extends Playable return false; } - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(ancientAdenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(ancientAdenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3518,23 +3484,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) - { - playerIU.addModifiedItem(destoyedItem); - } - else - { - playerIU.addRemovedItem(destoyedItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(destoyedItem); } else { - sendItemList(); + playerIU.addRemovedItem(destoyedItem); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3634,23 +3593,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > 0)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addRemovedItem(item); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - sendItemList(); + playerIU.addRemovedItem(item); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3696,45 +3648,31 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(oldItem); } else { - sendItemList(); + playerIU.addRemovedItem(oldItem); } + sendInventoryUpdate(playerIU); // Send target update packet if (target instanceof PlayerInventory) { final Player targetPlayer = ((PlayerInventory) target).getOwner(); - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate targetIU = new InventoryUpdate(); + if (newItem.getCount() > count) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (newItem.getCount() > count) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } - targetPlayer.sendPacket(playerIU); + targetIU.addModifiedItem(newItem); } else { - targetPlayer.sendItemList(); + targetIU.addNewItem(newItem); } + targetPlayer.sendPacket(targetIU); } return newItem; } @@ -3823,16 +3761,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(droppedItem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(droppedItem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3897,16 +3828,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(invitem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(invitem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index d1f6604627..18acfc5b0b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -421,16 +421,9 @@ public class PlayerInventory extends Inventory if (actor != null) { // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(addedItem); - actor.sendInventoryUpdate(playerIU); - } - else - { - actor.sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(addedItem); + actor.sendInventoryUpdate(playerIU); // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getTemplate()); @@ -487,23 +480,16 @@ public class PlayerInventory extends Inventory // Send inventory update packet if (update) { - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > count)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > count)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addNewItem(item); - } - actor.sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - actor.sendItemList(); + playerIU.addNewItem(item); } + actor.sendInventoryUpdate(playerIU); } // Notify to scripts @@ -1140,14 +1126,7 @@ public class PlayerInventory extends Inventory } finally { - if (Config.FORCE_INVENTORY_UPDATE) - { - _owner.sendItemList(); - } - else - { - _owner.sendInventoryUpdate(iu); - } + _owner.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 1d6a4dc9bf..09ec930191 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -161,7 +161,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -176,17 +176,15 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); } + else + { + playerIU.addNewItem(newItem); + } + final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); sm.addItemName(item.getId()); sm.addLong(count); @@ -196,10 +194,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket msg.removeAttachments(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 7e05426603..41154e77ac 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -207,22 +207,15 @@ public class RequestDestroyItem implements IClientIncomingPacket return; } - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate iu = new InventoryUpdate(); + if (removedItem.getCount() == 0) { - final InventoryUpdate iu = new InventoryUpdate(); - if (removedItem.getCount() == 0) - { - iu.addRemovedItem(removedItem); - } - else - { - iu.addModifiedItem(removedItem); - } - player.sendInventoryUpdate(iu); + iu.addRemovedItem(removedItem); } else { - player.sendItemList(); + iu.addModifiedItem(removedItem); } + player.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index e7f635a1db..d9c15d4bcc 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -401,7 +401,7 @@ public class RequestEnchantItem implements IClientIncomingPacket player.sendPacket(sm); } - if (!Config.FORCE_INVENTORY_UPDATE && (crystals != null)) + if (crystals != null) { iu.addItem(crystals); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 62b2ef4c5a..6b247a4044 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -163,7 +163,7 @@ public class RequestPackageSend implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder i : _items) { // Check validity of requested item @@ -182,16 +182,13 @@ public class RequestPackageSend implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } // Remove item objects from the world. @@ -202,13 +199,6 @@ public class RequestPackageSend implements IClientIncomingPacket warehouse.deleteMe(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index e2bf417fa1..a64b93a4bf 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -184,7 +184,7 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -205,16 +205,13 @@ public class RequestPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); + } + else + { + playerIU.addNewItem(newItem); } final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); @@ -224,10 +221,8 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 261390363c..d9c5df55f8 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -310,7 +310,7 @@ public class RequestSendPost implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (AttachmentItem i : _items) { // Check validity of requested item @@ -328,28 +328,19 @@ public class RequestSendPost implements IClientIncomingPacket continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); - if (playerIU != null) + + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 1c02a4a421..8e354c0c64 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -168,7 +168,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder itemHolder : _items) { // Check validity of requested item @@ -191,27 +191,17 @@ public class SendWareHouseDepositList implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/config/General.ini b/L2J_Mobius_05.5_EtinasFate/dist/game/config/General.ini index d9539820d8..a3023abbee 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/config/General.ini +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/config/General.ini @@ -242,12 +242,6 @@ ExaltedForHonorItemMax = 45873,100 # Default: True MultipleItemDrop = True -# Forces full item inventory packet to be sent for any item change. -# Notes: -# This can increase network traffic -# Default: False -ForceInventoryUpdate = False - # True = Load html's into cache only on first time html is requested. # False = Load all html's into cache on server startup. # Default: False diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/Config.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/Config.java index b92cee4157..c7ac4db033 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/Config.java @@ -478,7 +478,6 @@ public class Config public static ItemHolder EXALTED_FOR_GLORY_ITEM_MAX; public static ItemHolder EXALTED_FOR_HONOR_ITEM_MAX; public static boolean MULTIPLE_ITEM_DROP; - public static boolean FORCE_INVENTORY_UPDATE; public static boolean LAZY_CACHE; public static boolean CHECK_HTML_ENCODING; public static boolean CACHE_CHAR_NAMES; @@ -2021,7 +2020,6 @@ public class Config EXALTED_FOR_GLORY_ITEM_MAX = new ItemHolder(Integer.parseInt(generalConfig.getString("ExaltedForGloryItemMax", "45872,80").split(",")[0]), Integer.parseInt(generalConfig.getString("ExaltedForGloryItemMax", "45872,80").split(",")[1])); EXALTED_FOR_HONOR_ITEM_MAX = new ItemHolder(Integer.parseInt(generalConfig.getString("ExaltedForHonorItemMax", "45873,100").split(",")[0]), Integer.parseInt(generalConfig.getString("ExaltedForHonorItemMax", "45873,100").split(",")[1])); MULTIPLE_ITEM_DROP = generalConfig.getBoolean("MultipleItemDrop", true); - FORCE_INVENTORY_UPDATE = generalConfig.getBoolean("ForceInventoryUpdate", false); LAZY_CACHE = generalConfig.getBoolean("LazyCache", true); CHECK_HTML_ENCODING = generalConfig.getBoolean("CheckHtmlEncoding", true); CACHE_CHAR_NAMES = generalConfig.getBoolean("CacheCharNames", true); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/CombatFlag.java index faaeb77d79..86a7c361b3 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -82,16 +81,10 @@ public class CombatFlag _player.sendPacket(sm); // Refresh inventory - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_item); - _player.sendInventoryUpdate(iu); - } - else - { - _player.sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_item); + _player.sendInventoryUpdate(iu); + // Refresh player stats _player.broadcastUserInfo(); _player.setCombatFlagEquipped(true); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/TradeList.java index 531d70d789..0cb8de3cc5 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/TradeList.java @@ -591,31 +591,17 @@ public class TradeList else { // Prepare inventory update packet - final InventoryUpdate ownerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); - final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate ownerIU = new InventoryUpdate(); + final InventoryUpdate partnerIU = new InventoryUpdate(); // Transfer items partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); - // Send inventory update packet - if (ownerIU != null) - { - _owner.sendInventoryUpdate(ownerIU); - } - else - { - _owner.sendItemList(); - } + // Send inventory update packets + _owner.sendInventoryUpdate(ownerIU); + _partner.sendInventoryUpdate(partnerIU); - if (partnerIU != null) - { - _partner.sendInventoryUpdate(partnerIU); - } - else - { - _partner.sendItemList(); - } success = true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java index 65038a497b..0f0847a6ed 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -3125,22 +3125,15 @@ public class Player extends Playable _inventory.addAdena(process, count, this, reference); // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) + if (count == getAdena()) { - if (count == getAdena()) - { - sendItemList(); - } - else - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addModifiedItem(_inventory.getAdenaInstance()); - sendInventoryUpdate(iu); - } + sendItemList(); } else { - sendItemList(); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(_inventory.getAdenaInstance()); + sendInventoryUpdate(iu); } } } @@ -3173,16 +3166,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(adenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(adenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3223,16 +3209,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(beautyTickets); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(beautyTickets); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3275,16 +3254,10 @@ public class Player extends Playable if (count > 0) { _inventory.addAncientAdena(process, count, this, reference); - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_inventory.getAncientAdenaInstance()); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_inventory.getAncientAdenaInstance()); + sendInventoryUpdate(iu); } } @@ -3315,16 +3288,9 @@ public class Player extends Playable return false; } - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(ancientAdenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(ancientAdenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3531,23 +3497,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) - { - playerIU.addModifiedItem(destoyedItem); - } - else - { - playerIU.addRemovedItem(destoyedItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(destoyedItem); } else { - sendItemList(); + playerIU.addRemovedItem(destoyedItem); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3647,23 +3606,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > 0)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addRemovedItem(item); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - sendItemList(); + playerIU.addRemovedItem(item); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3709,45 +3661,31 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(oldItem); } else { - sendItemList(); + playerIU.addRemovedItem(oldItem); } + sendInventoryUpdate(playerIU); // Send target update packet if (target instanceof PlayerInventory) { final Player targetPlayer = ((PlayerInventory) target).getOwner(); - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate targetIU = new InventoryUpdate(); + if (newItem.getCount() > count) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (newItem.getCount() > count) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } - targetPlayer.sendPacket(playerIU); + targetIU.addModifiedItem(newItem); } else { - targetPlayer.sendItemList(); + targetIU.addNewItem(newItem); } + targetPlayer.sendPacket(targetIU); } return newItem; } @@ -3836,16 +3774,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(droppedItem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(droppedItem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3910,16 +3841,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(invitem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(invitem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index d1f6604627..18acfc5b0b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -421,16 +421,9 @@ public class PlayerInventory extends Inventory if (actor != null) { // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(addedItem); - actor.sendInventoryUpdate(playerIU); - } - else - { - actor.sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(addedItem); + actor.sendInventoryUpdate(playerIU); // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getTemplate()); @@ -487,23 +480,16 @@ public class PlayerInventory extends Inventory // Send inventory update packet if (update) { - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > count)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > count)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addNewItem(item); - } - actor.sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - actor.sendItemList(); + playerIU.addNewItem(item); } + actor.sendInventoryUpdate(playerIU); } // Notify to scripts @@ -1140,14 +1126,7 @@ public class PlayerInventory extends Inventory } finally { - if (Config.FORCE_INVENTORY_UPDATE) - { - _owner.sendItemList(); - } - else - { - _owner.sendInventoryUpdate(iu); - } + _owner.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 1d6a4dc9bf..09ec930191 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -161,7 +161,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -176,17 +176,15 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); } + else + { + playerIU.addNewItem(newItem); + } + final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); sm.addItemName(item.getId()); sm.addLong(count); @@ -196,10 +194,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket msg.removeAttachments(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 7e05426603..41154e77ac 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -207,22 +207,15 @@ public class RequestDestroyItem implements IClientIncomingPacket return; } - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate iu = new InventoryUpdate(); + if (removedItem.getCount() == 0) { - final InventoryUpdate iu = new InventoryUpdate(); - if (removedItem.getCount() == 0) - { - iu.addRemovedItem(removedItem); - } - else - { - iu.addModifiedItem(removedItem); - } - player.sendInventoryUpdate(iu); + iu.addRemovedItem(removedItem); } else { - player.sendItemList(); + iu.addModifiedItem(removedItem); } + player.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index e7f635a1db..d9c15d4bcc 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -401,7 +401,7 @@ public class RequestEnchantItem implements IClientIncomingPacket player.sendPacket(sm); } - if (!Config.FORCE_INVENTORY_UPDATE && (crystals != null)) + if (crystals != null) { iu.addItem(crystals); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 62b2ef4c5a..6b247a4044 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -163,7 +163,7 @@ public class RequestPackageSend implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder i : _items) { // Check validity of requested item @@ -182,16 +182,13 @@ public class RequestPackageSend implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } // Remove item objects from the world. @@ -202,13 +199,6 @@ public class RequestPackageSend implements IClientIncomingPacket warehouse.deleteMe(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index e2bf417fa1..a64b93a4bf 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -184,7 +184,7 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -205,16 +205,13 @@ public class RequestPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); + } + else + { + playerIU.addNewItem(newItem); } final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); @@ -224,10 +221,8 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 9f217064bb..eb47cc8375 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -310,7 +310,7 @@ public class RequestSendPost implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (AttachmentItem i : _items) { // Check validity of requested item @@ -328,28 +328,19 @@ public class RequestSendPost implements IClientIncomingPacket continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); - if (playerIU != null) + + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 1c02a4a421..8e354c0c64 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -168,7 +168,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder itemHolder : _items) { // Check validity of requested item @@ -191,27 +191,17 @@ public class SendWareHouseDepositList implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/config/General.ini b/L2J_Mobius_06.0_Fafurion/dist/game/config/General.ini index d9539820d8..a3023abbee 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/config/General.ini +++ b/L2J_Mobius_06.0_Fafurion/dist/game/config/General.ini @@ -242,12 +242,6 @@ ExaltedForHonorItemMax = 45873,100 # Default: True MultipleItemDrop = True -# Forces full item inventory packet to be sent for any item change. -# Notes: -# This can increase network traffic -# Default: False -ForceInventoryUpdate = False - # True = Load html's into cache only on first time html is requested. # False = Load all html's into cache on server startup. # Default: False diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/Config.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/Config.java index ec1af79ce9..9787c8721a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/Config.java @@ -479,7 +479,6 @@ public class Config public static ItemHolder EXALTED_FOR_GLORY_ITEM_MAX; public static ItemHolder EXALTED_FOR_HONOR_ITEM_MAX; public static boolean MULTIPLE_ITEM_DROP; - public static boolean FORCE_INVENTORY_UPDATE; public static boolean LAZY_CACHE; public static boolean CHECK_HTML_ENCODING; public static boolean CACHE_CHAR_NAMES; @@ -2060,7 +2059,6 @@ public class Config EXALTED_FOR_GLORY_ITEM_MAX = new ItemHolder(Integer.parseInt(generalConfig.getString("ExaltedForGloryItemMax", "45872,80").split(",")[0]), Integer.parseInt(generalConfig.getString("ExaltedForGloryItemMax", "45872,80").split(",")[1])); EXALTED_FOR_HONOR_ITEM_MAX = new ItemHolder(Integer.parseInt(generalConfig.getString("ExaltedForHonorItemMax", "45873,100").split(",")[0]), Integer.parseInt(generalConfig.getString("ExaltedForHonorItemMax", "45873,100").split(",")[1])); MULTIPLE_ITEM_DROP = generalConfig.getBoolean("MultipleItemDrop", true); - FORCE_INVENTORY_UPDATE = generalConfig.getBoolean("ForceInventoryUpdate", false); LAZY_CACHE = generalConfig.getBoolean("LazyCache", true); CHECK_HTML_ENCODING = generalConfig.getBoolean("CheckHtmlEncoding", true); CACHE_CHAR_NAMES = generalConfig.getBoolean("CacheCharNames", true); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/CombatFlag.java index faaeb77d79..86a7c361b3 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -82,16 +81,10 @@ public class CombatFlag _player.sendPacket(sm); // Refresh inventory - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_item); - _player.sendInventoryUpdate(iu); - } - else - { - _player.sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_item); + _player.sendInventoryUpdate(iu); + // Refresh player stats _player.broadcastUserInfo(); _player.setCombatFlagEquipped(true); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/TradeList.java index 531d70d789..0cb8de3cc5 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/TradeList.java @@ -591,31 +591,17 @@ public class TradeList else { // Prepare inventory update packet - final InventoryUpdate ownerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); - final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate ownerIU = new InventoryUpdate(); + final InventoryUpdate partnerIU = new InventoryUpdate(); // Transfer items partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); - // Send inventory update packet - if (ownerIU != null) - { - _owner.sendInventoryUpdate(ownerIU); - } - else - { - _owner.sendItemList(); - } + // Send inventory update packets + _owner.sendInventoryUpdate(ownerIU); + _partner.sendInventoryUpdate(partnerIU); - if (partnerIU != null) - { - _partner.sendInventoryUpdate(partnerIU); - } - else - { - _partner.sendItemList(); - } success = true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java index 35b5c104d8..1a665fd5d2 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -3126,22 +3126,15 @@ public class Player extends Playable _inventory.addAdena(process, count, this, reference); // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) + if (count == getAdena()) { - if (count == getAdena()) - { - sendItemList(); - } - else - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addModifiedItem(_inventory.getAdenaInstance()); - sendInventoryUpdate(iu); - } + sendItemList(); } else { - sendItemList(); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(_inventory.getAdenaInstance()); + sendInventoryUpdate(iu); } } } @@ -3174,16 +3167,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(adenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(adenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3224,16 +3210,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(beautyTickets); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(beautyTickets); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3276,16 +3255,10 @@ public class Player extends Playable if (count > 0) { _inventory.addAncientAdena(process, count, this, reference); - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_inventory.getAncientAdenaInstance()); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_inventory.getAncientAdenaInstance()); + sendInventoryUpdate(iu); } } @@ -3316,16 +3289,9 @@ public class Player extends Playable return false; } - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(ancientAdenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(ancientAdenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3532,23 +3498,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) - { - playerIU.addModifiedItem(destoyedItem); - } - else - { - playerIU.addRemovedItem(destoyedItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(destoyedItem); } else { - sendItemList(); + playerIU.addRemovedItem(destoyedItem); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3648,23 +3607,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > 0)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addRemovedItem(item); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - sendItemList(); + playerIU.addRemovedItem(item); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3710,45 +3662,31 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(oldItem); } else { - sendItemList(); + playerIU.addRemovedItem(oldItem); } + sendInventoryUpdate(playerIU); // Send target update packet if (target instanceof PlayerInventory) { final Player targetPlayer = ((PlayerInventory) target).getOwner(); - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate targetIU = new InventoryUpdate(); + if (newItem.getCount() > count) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (newItem.getCount() > count) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } - targetPlayer.sendPacket(playerIU); + targetIU.addModifiedItem(newItem); } else { - targetPlayer.sendItemList(); + targetIU.addNewItem(newItem); } + targetPlayer.sendPacket(targetIU); } return newItem; } @@ -3837,16 +3775,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(droppedItem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(droppedItem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3911,16 +3842,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(invitem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(invitem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index d1f6604627..18acfc5b0b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -421,16 +421,9 @@ public class PlayerInventory extends Inventory if (actor != null) { // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(addedItem); - actor.sendInventoryUpdate(playerIU); - } - else - { - actor.sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(addedItem); + actor.sendInventoryUpdate(playerIU); // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getTemplate()); @@ -487,23 +480,16 @@ public class PlayerInventory extends Inventory // Send inventory update packet if (update) { - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > count)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > count)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addNewItem(item); - } - actor.sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - actor.sendItemList(); + playerIU.addNewItem(item); } + actor.sendInventoryUpdate(playerIU); } // Notify to scripts @@ -1140,14 +1126,7 @@ public class PlayerInventory extends Inventory } finally { - if (Config.FORCE_INVENTORY_UPDATE) - { - _owner.sendItemList(); - } - else - { - _owner.sendInventoryUpdate(iu); - } + _owner.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 1d6a4dc9bf..09ec930191 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -161,7 +161,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -176,17 +176,15 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); } + else + { + playerIU.addNewItem(newItem); + } + final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); sm.addItemName(item.getId()); sm.addLong(count); @@ -196,10 +194,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket msg.removeAttachments(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 7e05426603..41154e77ac 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -207,22 +207,15 @@ public class RequestDestroyItem implements IClientIncomingPacket return; } - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate iu = new InventoryUpdate(); + if (removedItem.getCount() == 0) { - final InventoryUpdate iu = new InventoryUpdate(); - if (removedItem.getCount() == 0) - { - iu.addRemovedItem(removedItem); - } - else - { - iu.addModifiedItem(removedItem); - } - player.sendInventoryUpdate(iu); + iu.addRemovedItem(removedItem); } else { - player.sendItemList(); + iu.addModifiedItem(removedItem); } + player.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 6e5e23fcd0..7b92190770 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -403,7 +403,7 @@ public class RequestEnchantItem implements IClientIncomingPacket player.sendPacket(sm); } - if (!Config.FORCE_INVENTORY_UPDATE && (crystals != null)) + if (crystals != null) { iu.addItem(crystals); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 62b2ef4c5a..6b247a4044 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -163,7 +163,7 @@ public class RequestPackageSend implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder i : _items) { // Check validity of requested item @@ -182,16 +182,13 @@ public class RequestPackageSend implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } // Remove item objects from the world. @@ -202,13 +199,6 @@ public class RequestPackageSend implements IClientIncomingPacket warehouse.deleteMe(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index e2bf417fa1..a64b93a4bf 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -184,7 +184,7 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -205,16 +205,13 @@ public class RequestPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); + } + else + { + playerIU.addNewItem(newItem); } final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); @@ -224,10 +221,8 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 9f217064bb..eb47cc8375 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -310,7 +310,7 @@ public class RequestSendPost implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (AttachmentItem i : _items) { // Check validity of requested item @@ -328,28 +328,19 @@ public class RequestSendPost implements IClientIncomingPacket continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); - if (playerIU != null) + + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 1c02a4a421..8e354c0c64 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -168,7 +168,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder itemHolder : _items) { // Check validity of requested item @@ -191,27 +191,17 @@ public class SendWareHouseDepositList implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/config/General.ini b/L2J_Mobius_07.0_PreludeOfWar/dist/game/config/General.ini index 472a30f2a8..d8e1470c00 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/config/General.ini +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/config/General.ini @@ -243,12 +243,6 @@ ExaltedForVictoryItemMax = 80825,30 # Default: True MultipleItemDrop = True -# Forces full item inventory packet to be sent for any item change. -# Notes: -# This can increase network traffic -# Default: False -ForceInventoryUpdate = False - # True = Load html's into cache only on first time html is requested. # False = Load all html's into cache on server startup. # Default: False diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/Config.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/Config.java index 7004f1d72d..7be8c53839 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/Config.java @@ -480,7 +480,6 @@ public class Config public static ItemHolder EXALTED_FOR_HONOR_ITEM_MAX; public static ItemHolder EXALTED_FOR_VICTORY_ITEM_MAX; public static boolean MULTIPLE_ITEM_DROP; - public static boolean FORCE_INVENTORY_UPDATE; public static boolean LAZY_CACHE; public static boolean CHECK_HTML_ENCODING; public static boolean CACHE_CHAR_NAMES; @@ -2071,7 +2070,6 @@ public class Config EXALTED_FOR_HONOR_ITEM_MAX = new ItemHolder(Integer.parseInt(generalConfig.getString("ExaltedForHonorItemMax", "45873,20").split(",")[0]), Integer.parseInt(generalConfig.getString("ExaltedForHonorItemMax", "45873,20").split(",")[1])); EXALTED_FOR_VICTORY_ITEM_MAX = new ItemHolder(Integer.parseInt(generalConfig.getString("ExaltedForVictoryItemMax", "80825,30").split(",")[0]), Integer.parseInt(generalConfig.getString("ExaltedForVictoryItemMax", "80825,30").split(",")[1])); MULTIPLE_ITEM_DROP = generalConfig.getBoolean("MultipleItemDrop", true); - FORCE_INVENTORY_UPDATE = generalConfig.getBoolean("ForceInventoryUpdate", false); LAZY_CACHE = generalConfig.getBoolean("LazyCache", true); CHECK_HTML_ENCODING = generalConfig.getBoolean("CheckHtmlEncoding", true); CACHE_CHAR_NAMES = generalConfig.getBoolean("CacheCharNames", true); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/CombatFlag.java index e0487f9079..e743f8e5c2 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -82,16 +81,10 @@ public class CombatFlag _player.sendPacket(sm); // Refresh inventory - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_item); - _player.sendInventoryUpdate(iu); - } - else - { - _player.sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_item); + _player.sendInventoryUpdate(iu); + // Refresh player stats _player.broadcastUserInfo(); _player.setCombatFlagEquipped(true); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TradeList.java index 531d70d789..0cb8de3cc5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TradeList.java @@ -591,31 +591,17 @@ public class TradeList else { // Prepare inventory update packet - final InventoryUpdate ownerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); - final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate ownerIU = new InventoryUpdate(); + final InventoryUpdate partnerIU = new InventoryUpdate(); // Transfer items partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); - // Send inventory update packet - if (ownerIU != null) - { - _owner.sendInventoryUpdate(ownerIU); - } - else - { - _owner.sendItemList(); - } + // Send inventory update packets + _owner.sendInventoryUpdate(ownerIU); + _partner.sendInventoryUpdate(partnerIU); - if (partnerIU != null) - { - _partner.sendInventoryUpdate(partnerIU); - } - else - { - _partner.sendItemList(); - } success = true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java index 222afe39d9..95cc657810 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -3062,22 +3062,15 @@ public class Player extends Playable _inventory.addAdena(process, count, this, reference); // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) + if (count == getAdena()) { - if (count == getAdena()) - { - sendItemList(); - } - else - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addModifiedItem(_inventory.getAdenaInstance()); - sendInventoryUpdate(iu); - } + sendItemList(); } else { - sendItemList(); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(_inventory.getAdenaInstance()); + sendInventoryUpdate(iu); } } } @@ -3110,16 +3103,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(adenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(adenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3160,16 +3146,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(beautyTickets); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(beautyTickets); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3212,16 +3191,10 @@ public class Player extends Playable if (count > 0) { _inventory.addAncientAdena(process, count, this, reference); - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_inventory.getAncientAdenaInstance()); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_inventory.getAncientAdenaInstance()); + sendInventoryUpdate(iu); } } @@ -3252,16 +3225,9 @@ public class Player extends Playable return false; } - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(ancientAdenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(ancientAdenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3468,23 +3434,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) - { - playerIU.addModifiedItem(destoyedItem); - } - else - { - playerIU.addRemovedItem(destoyedItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(destoyedItem); } else { - sendItemList(); + playerIU.addRemovedItem(destoyedItem); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3584,23 +3543,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > 0)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addRemovedItem(item); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - sendItemList(); + playerIU.addRemovedItem(item); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3646,45 +3598,31 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(oldItem); } else { - sendItemList(); + playerIU.addRemovedItem(oldItem); } + sendInventoryUpdate(playerIU); // Send target update packet if (target instanceof PlayerInventory) { final Player targetPlayer = ((PlayerInventory) target).getOwner(); - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate targetIU = new InventoryUpdate(); + if (newItem.getCount() > count) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (newItem.getCount() > count) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } - targetPlayer.sendPacket(playerIU); + targetIU.addModifiedItem(newItem); } else { - targetPlayer.sendItemList(); + targetIU.addNewItem(newItem); } + targetPlayer.sendPacket(targetIU); } return newItem; } @@ -3773,16 +3711,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(droppedItem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(droppedItem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3847,16 +3778,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(invitem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(invitem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index d1f6604627..18acfc5b0b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -421,16 +421,9 @@ public class PlayerInventory extends Inventory if (actor != null) { // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(addedItem); - actor.sendInventoryUpdate(playerIU); - } - else - { - actor.sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(addedItem); + actor.sendInventoryUpdate(playerIU); // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getTemplate()); @@ -487,23 +480,16 @@ public class PlayerInventory extends Inventory // Send inventory update packet if (update) { - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > count)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > count)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addNewItem(item); - } - actor.sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - actor.sendItemList(); + playerIU.addNewItem(item); } + actor.sendInventoryUpdate(playerIU); } // Notify to scripts @@ -1140,14 +1126,7 @@ public class PlayerInventory extends Inventory } finally { - if (Config.FORCE_INVENTORY_UPDATE) - { - _owner.sendItemList(); - } - else - { - _owner.sendInventoryUpdate(iu); - } + _owner.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 1d6a4dc9bf..09ec930191 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -161,7 +161,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -176,17 +176,15 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); } + else + { + playerIU.addNewItem(newItem); + } + final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); sm.addItemName(item.getId()); sm.addLong(count); @@ -196,10 +194,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket msg.removeAttachments(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 7e05426603..41154e77ac 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -207,22 +207,15 @@ public class RequestDestroyItem implements IClientIncomingPacket return; } - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate iu = new InventoryUpdate(); + if (removedItem.getCount() == 0) { - final InventoryUpdate iu = new InventoryUpdate(); - if (removedItem.getCount() == 0) - { - iu.addRemovedItem(removedItem); - } - else - { - iu.addModifiedItem(removedItem); - } - player.sendInventoryUpdate(iu); + iu.addRemovedItem(removedItem); } else { - player.sendItemList(); + iu.addModifiedItem(removedItem); } + player.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 52e402ebca..50b7dccdb9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -403,7 +403,7 @@ public class RequestEnchantItem implements IClientIncomingPacket player.sendPacket(sm); } - if (!Config.FORCE_INVENTORY_UPDATE && (crystals != null)) + if (crystals != null) { iu.addItem(crystals); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 62b2ef4c5a..6b247a4044 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -163,7 +163,7 @@ public class RequestPackageSend implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder i : _items) { // Check validity of requested item @@ -182,16 +182,13 @@ public class RequestPackageSend implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } // Remove item objects from the world. @@ -202,13 +199,6 @@ public class RequestPackageSend implements IClientIncomingPacket warehouse.deleteMe(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index e2bf417fa1..a64b93a4bf 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -184,7 +184,7 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -205,16 +205,13 @@ public class RequestPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); + } + else + { + playerIU.addNewItem(newItem); } final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); @@ -224,10 +221,8 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 3582b308eb..58cf805178 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -310,7 +310,7 @@ public class RequestSendPost implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (AttachmentItem i : _items) { // Check validity of requested item @@ -328,28 +328,19 @@ public class RequestSendPost implements IClientIncomingPacket continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); - if (playerIU != null) + + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 1c02a4a421..8e354c0c64 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -168,7 +168,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder itemHolder : _items) { // Check validity of requested item @@ -191,27 +191,17 @@ public class SendWareHouseDepositList implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/config/General.ini b/L2J_Mobius_08.2_Homunculus/dist/game/config/General.ini index 33c41c47f0..413d794af8 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/config/General.ini +++ b/L2J_Mobius_08.2_Homunculus/dist/game/config/General.ini @@ -238,12 +238,6 @@ StoryQuestRewardBuff = True # Default: True MultipleItemDrop = True -# Forces full item inventory packet to be sent for any item change. -# Notes: -# This can increase network traffic -# Default: False -ForceInventoryUpdate = False - # True = Load html's into cache only on first time html is requested. # False = Load all html's into cache on server startup. # Default: False diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/Config.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/Config.java index bbf6c08e6c..52e5702bae 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/Config.java @@ -470,7 +470,6 @@ public class Config public static boolean AUTODELETE_INVALID_QUEST_DATA; public static boolean ENABLE_STORY_QUEST_BUFF_REWARD; public static boolean MULTIPLE_ITEM_DROP; - public static boolean FORCE_INVENTORY_UPDATE; public static boolean LAZY_CACHE; public static boolean CHECK_HTML_ENCODING; public static boolean CACHE_CHAR_NAMES; @@ -2047,7 +2046,6 @@ public class Config AUTODELETE_INVALID_QUEST_DATA = generalConfig.getBoolean("AutoDeleteInvalidQuestData", false); ENABLE_STORY_QUEST_BUFF_REWARD = generalConfig.getBoolean("StoryQuestRewardBuff", true); MULTIPLE_ITEM_DROP = generalConfig.getBoolean("MultipleItemDrop", true); - FORCE_INVENTORY_UPDATE = generalConfig.getBoolean("ForceInventoryUpdate", false); LAZY_CACHE = generalConfig.getBoolean("LazyCache", true); CHECK_HTML_ENCODING = generalConfig.getBoolean("CheckHtmlEncoding", true); CACHE_CHAR_NAMES = generalConfig.getBoolean("CacheCharNames", true); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/CombatFlag.java index e0487f9079..e743f8e5c2 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -82,16 +81,10 @@ public class CombatFlag _player.sendPacket(sm); // Refresh inventory - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_item); - _player.sendInventoryUpdate(iu); - } - else - { - _player.sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_item); + _player.sendInventoryUpdate(iu); + // Refresh player stats _player.broadcastUserInfo(); _player.setCombatFlagEquipped(true); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/TradeList.java index 531d70d789..0cb8de3cc5 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/TradeList.java @@ -591,31 +591,17 @@ public class TradeList else { // Prepare inventory update packet - final InventoryUpdate ownerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); - final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate ownerIU = new InventoryUpdate(); + final InventoryUpdate partnerIU = new InventoryUpdate(); // Transfer items partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); - // Send inventory update packet - if (ownerIU != null) - { - _owner.sendInventoryUpdate(ownerIU); - } - else - { - _owner.sendItemList(); - } + // Send inventory update packets + _owner.sendInventoryUpdate(ownerIU); + _partner.sendInventoryUpdate(partnerIU); - if (partnerIU != null) - { - _partner.sendInventoryUpdate(partnerIU); - } - else - { - _partner.sendItemList(); - } success = true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java index f4d66bc22a..a30def8738 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -3100,22 +3100,15 @@ public class Player extends Playable _inventory.addAdena(process, count, this, reference); // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) + if (count == getAdena()) { - if (count == getAdena()) - { - sendItemList(); - } - else - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addModifiedItem(_inventory.getAdenaInstance()); - sendInventoryUpdate(iu); - } + sendItemList(); } else { - sendItemList(); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(_inventory.getAdenaInstance()); + sendInventoryUpdate(iu); } } } @@ -3148,16 +3141,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(adenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(adenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3198,16 +3184,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(beautyTickets); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(beautyTickets); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3250,16 +3229,10 @@ public class Player extends Playable if (count > 0) { _inventory.addAncientAdena(process, count, this, reference); - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_inventory.getAncientAdenaInstance()); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_inventory.getAncientAdenaInstance()); + sendInventoryUpdate(iu); } } @@ -3290,16 +3263,9 @@ public class Player extends Playable return false; } - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(ancientAdenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(ancientAdenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3506,23 +3472,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) - { - playerIU.addModifiedItem(destoyedItem); - } - else - { - playerIU.addRemovedItem(destoyedItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(destoyedItem); } else { - sendItemList(); + playerIU.addRemovedItem(destoyedItem); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3622,23 +3581,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > 0)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addRemovedItem(item); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - sendItemList(); + playerIU.addRemovedItem(item); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3684,45 +3636,31 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(oldItem); } else { - sendItemList(); + playerIU.addRemovedItem(oldItem); } + sendInventoryUpdate(playerIU); // Send target update packet if (target instanceof PlayerInventory) { final Player targetPlayer = ((PlayerInventory) target).getOwner(); - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate targetIU = new InventoryUpdate(); + if (newItem.getCount() > count) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (newItem.getCount() > count) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } - targetPlayer.sendPacket(playerIU); + targetIU.addModifiedItem(newItem); } else { - targetPlayer.sendItemList(); + targetIU.addNewItem(newItem); } + targetPlayer.sendPacket(targetIU); } return newItem; } @@ -3811,16 +3749,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(droppedItem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(droppedItem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3885,16 +3816,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(invitem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(invitem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index dc1bd17593..cc781cbad6 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -422,16 +422,9 @@ public class PlayerInventory extends Inventory if (actor != null) { // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(addedItem); - actor.sendInventoryUpdate(playerIU); - } - else - { - actor.sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(addedItem); + actor.sendInventoryUpdate(playerIU); // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getTemplate()); @@ -488,23 +481,16 @@ public class PlayerInventory extends Inventory // Send inventory update packet if (update) { - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > count)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > count)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addNewItem(item); - } - actor.sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - actor.sendItemList(); + playerIU.addNewItem(item); } + actor.sendInventoryUpdate(playerIU); } // Notify to scripts @@ -1167,14 +1153,7 @@ public class PlayerInventory extends Inventory } finally { - if (Config.FORCE_INVENTORY_UPDATE) - { - _owner.sendItemList(); - } - else - { - _owner.sendInventoryUpdate(iu); - } + _owner.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 1d6a4dc9bf..09ec930191 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -161,7 +161,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -176,17 +176,15 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); } + else + { + playerIU.addNewItem(newItem); + } + final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); sm.addItemName(item.getId()); sm.addLong(count); @@ -196,10 +194,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket msg.removeAttachments(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 7e05426603..41154e77ac 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -207,22 +207,15 @@ public class RequestDestroyItem implements IClientIncomingPacket return; } - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate iu = new InventoryUpdate(); + if (removedItem.getCount() == 0) { - final InventoryUpdate iu = new InventoryUpdate(); - if (removedItem.getCount() == 0) - { - iu.addRemovedItem(removedItem); - } - else - { - iu.addModifiedItem(removedItem); - } - player.sendInventoryUpdate(iu); + iu.addRemovedItem(removedItem); } else { - player.sendItemList(); + iu.addModifiedItem(removedItem); } + player.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index c66b217ece..2c8f038735 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -403,7 +403,7 @@ public class RequestEnchantItem implements IClientIncomingPacket player.sendPacket(sm); } - if (!Config.FORCE_INVENTORY_UPDATE && (crystals != null)) + if (crystals != null) { iu.addItem(crystals); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 8dae89d3bf..292b1b20a2 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -156,7 +156,7 @@ public class RequestPackageSend implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder i : _items) { // Check validity of requested item @@ -175,16 +175,13 @@ public class RequestPackageSend implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } // Remove item objects from the world. @@ -195,13 +192,6 @@ public class RequestPackageSend implements IClientIncomingPacket warehouse.deleteMe(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index e2bf417fa1..a64b93a4bf 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -184,7 +184,7 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -205,16 +205,13 @@ public class RequestPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); + } + else + { + playerIU.addNewItem(newItem); } final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); @@ -224,10 +221,8 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 3582b308eb..58cf805178 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -310,7 +310,7 @@ public class RequestSendPost implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (AttachmentItem i : _items) { // Check validity of requested item @@ -328,28 +328,19 @@ public class RequestSendPost implements IClientIncomingPacket continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); - if (playerIU != null) + + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 1c02a4a421..8e354c0c64 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -168,7 +168,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder itemHolder : _items) { // Check validity of requested item @@ -191,27 +191,17 @@ public class SendWareHouseDepositList implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/config/General.ini b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/config/General.ini index 33c41c47f0..413d794af8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/config/General.ini +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/config/General.ini @@ -238,12 +238,6 @@ StoryQuestRewardBuff = True # Default: True MultipleItemDrop = True -# Forces full item inventory packet to be sent for any item change. -# Notes: -# This can increase network traffic -# Default: False -ForceInventoryUpdate = False - # True = Load html's into cache only on first time html is requested. # False = Load all html's into cache on server startup. # Default: False diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/Config.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/Config.java index 116221fa12..d6ebce5afa 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/Config.java @@ -470,7 +470,6 @@ public class Config public static boolean AUTODELETE_INVALID_QUEST_DATA; public static boolean ENABLE_STORY_QUEST_BUFF_REWARD; public static boolean MULTIPLE_ITEM_DROP; - public static boolean FORCE_INVENTORY_UPDATE; public static boolean LAZY_CACHE; public static boolean CHECK_HTML_ENCODING; public static boolean CACHE_CHAR_NAMES; @@ -2083,7 +2082,6 @@ public class Config AUTODELETE_INVALID_QUEST_DATA = generalConfig.getBoolean("AutoDeleteInvalidQuestData", false); ENABLE_STORY_QUEST_BUFF_REWARD = generalConfig.getBoolean("StoryQuestRewardBuff", true); MULTIPLE_ITEM_DROP = generalConfig.getBoolean("MultipleItemDrop", true); - FORCE_INVENTORY_UPDATE = generalConfig.getBoolean("ForceInventoryUpdate", false); LAZY_CACHE = generalConfig.getBoolean("LazyCache", true); CHECK_HTML_ENCODING = generalConfig.getBoolean("CheckHtmlEncoding", true); CACHE_CHAR_NAMES = generalConfig.getBoolean("CacheCharNames", true); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/CombatFlag.java index e0487f9079..e743f8e5c2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -82,16 +81,10 @@ public class CombatFlag _player.sendPacket(sm); // Refresh inventory - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_item); - _player.sendInventoryUpdate(iu); - } - else - { - _player.sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_item); + _player.sendInventoryUpdate(iu); + // Refresh player stats _player.broadcastUserInfo(); _player.setCombatFlagEquipped(true); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/TradeList.java index 531d70d789..0cb8de3cc5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/TradeList.java @@ -591,31 +591,17 @@ public class TradeList else { // Prepare inventory update packet - final InventoryUpdate ownerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); - final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate ownerIU = new InventoryUpdate(); + final InventoryUpdate partnerIU = new InventoryUpdate(); // Transfer items partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); - // Send inventory update packet - if (ownerIU != null) - { - _owner.sendInventoryUpdate(ownerIU); - } - else - { - _owner.sendItemList(); - } + // Send inventory update packets + _owner.sendInventoryUpdate(ownerIU); + _partner.sendInventoryUpdate(partnerIU); - if (partnerIU != null) - { - _partner.sendInventoryUpdate(partnerIU); - } - else - { - _partner.sendItemList(); - } success = true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java index 3575b50f79..519ce6c760 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -3117,22 +3117,15 @@ public class Player extends Playable _inventory.addAdena(process, count, this, reference); // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) + if (count == getAdena()) { - if (count == getAdena()) - { - sendItemList(); - } - else - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addModifiedItem(_inventory.getAdenaInstance()); - sendInventoryUpdate(iu); - } + sendItemList(); } else { - sendItemList(); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(_inventory.getAdenaInstance()); + sendInventoryUpdate(iu); } } } @@ -3165,16 +3158,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(adenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(adenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3215,16 +3201,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(beautyTickets); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(beautyTickets); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3267,16 +3246,10 @@ public class Player extends Playable if (count > 0) { _inventory.addAncientAdena(process, count, this, reference); - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_inventory.getAncientAdenaInstance()); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_inventory.getAncientAdenaInstance()); + sendInventoryUpdate(iu); } } @@ -3307,16 +3280,9 @@ public class Player extends Playable return false; } - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(ancientAdenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(ancientAdenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3523,23 +3489,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) - { - playerIU.addModifiedItem(destoyedItem); - } - else - { - playerIU.addRemovedItem(destoyedItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(destoyedItem); } else { - sendItemList(); + playerIU.addRemovedItem(destoyedItem); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3639,23 +3598,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > 0)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addRemovedItem(item); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - sendItemList(); + playerIU.addRemovedItem(item); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3701,45 +3653,31 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(oldItem); } else { - sendItemList(); + playerIU.addRemovedItem(oldItem); } + sendInventoryUpdate(playerIU); // Send target update packet if (target instanceof PlayerInventory) { final Player targetPlayer = ((PlayerInventory) target).getOwner(); - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate targetIU = new InventoryUpdate(); + if (newItem.getCount() > count) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (newItem.getCount() > count) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } - targetPlayer.sendPacket(playerIU); + targetIU.addModifiedItem(newItem); } else { - targetPlayer.sendItemList(); + targetIU.addNewItem(newItem); } + targetPlayer.sendPacket(targetIU); } return newItem; } @@ -3828,16 +3766,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(droppedItem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(droppedItem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3902,16 +3833,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(invitem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(invitem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index dc1bd17593..cc781cbad6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -422,16 +422,9 @@ public class PlayerInventory extends Inventory if (actor != null) { // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(addedItem); - actor.sendInventoryUpdate(playerIU); - } - else - { - actor.sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(addedItem); + actor.sendInventoryUpdate(playerIU); // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getTemplate()); @@ -488,23 +481,16 @@ public class PlayerInventory extends Inventory // Send inventory update packet if (update) { - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > count)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > count)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addNewItem(item); - } - actor.sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - actor.sendItemList(); + playerIU.addNewItem(item); } + actor.sendInventoryUpdate(playerIU); } // Notify to scripts @@ -1167,14 +1153,7 @@ public class PlayerInventory extends Inventory } finally { - if (Config.FORCE_INVENTORY_UPDATE) - { - _owner.sendItemList(); - } - else - { - _owner.sendInventoryUpdate(iu); - } + _owner.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 1d6a4dc9bf..09ec930191 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -161,7 +161,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -176,17 +176,15 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); } + else + { + playerIU.addNewItem(newItem); + } + final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); sm.addItemName(item.getId()); sm.addLong(count); @@ -196,10 +194,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket msg.removeAttachments(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 7e05426603..41154e77ac 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -207,22 +207,15 @@ public class RequestDestroyItem implements IClientIncomingPacket return; } - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate iu = new InventoryUpdate(); + if (removedItem.getCount() == 0) { - final InventoryUpdate iu = new InventoryUpdate(); - if (removedItem.getCount() == 0) - { - iu.addRemovedItem(removedItem); - } - else - { - iu.addModifiedItem(removedItem); - } - player.sendInventoryUpdate(iu); + iu.addRemovedItem(removedItem); } else { - player.sendItemList(); + iu.addModifiedItem(removedItem); } + player.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index c66b217ece..2c8f038735 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -403,7 +403,7 @@ public class RequestEnchantItem implements IClientIncomingPacket player.sendPacket(sm); } - if (!Config.FORCE_INVENTORY_UPDATE && (crystals != null)) + if (crystals != null) { iu.addItem(crystals); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 8dae89d3bf..292b1b20a2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -156,7 +156,7 @@ public class RequestPackageSend implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder i : _items) { // Check validity of requested item @@ -175,16 +175,13 @@ public class RequestPackageSend implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } // Remove item objects from the world. @@ -195,13 +192,6 @@ public class RequestPackageSend implements IClientIncomingPacket warehouse.deleteMe(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index e2bf417fa1..a64b93a4bf 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -184,7 +184,7 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -205,16 +205,13 @@ public class RequestPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); + } + else + { + playerIU.addNewItem(newItem); } final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); @@ -224,10 +221,8 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 3582b308eb..58cf805178 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -310,7 +310,7 @@ public class RequestSendPost implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (AttachmentItem i : _items) { // Check validity of requested item @@ -328,28 +328,19 @@ public class RequestSendPost implements IClientIncomingPacket continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); - if (playerIU != null) + + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 1c02a4a421..8e354c0c64 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -168,7 +168,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder itemHolder : _items) { // Check validity of requested item @@ -191,27 +191,17 @@ public class SendWareHouseDepositList implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/config/General.ini b/L2J_Mobius_10.1_MasterClass/dist/game/config/General.ini index 33c41c47f0..413d794af8 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/config/General.ini +++ b/L2J_Mobius_10.1_MasterClass/dist/game/config/General.ini @@ -238,12 +238,6 @@ StoryQuestRewardBuff = True # Default: True MultipleItemDrop = True -# Forces full item inventory packet to be sent for any item change. -# Notes: -# This can increase network traffic -# Default: False -ForceInventoryUpdate = False - # True = Load html's into cache only on first time html is requested. # False = Load all html's into cache on server startup. # Default: False diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/Config.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/Config.java index 995a1b4618..cbed4874cb 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/Config.java @@ -470,7 +470,6 @@ public class Config public static boolean AUTODELETE_INVALID_QUEST_DATA; public static boolean ENABLE_STORY_QUEST_BUFF_REWARD; public static boolean MULTIPLE_ITEM_DROP; - public static boolean FORCE_INVENTORY_UPDATE; public static boolean LAZY_CACHE; public static boolean CHECK_HTML_ENCODING; public static boolean CACHE_CHAR_NAMES; @@ -2083,7 +2082,6 @@ public class Config AUTODELETE_INVALID_QUEST_DATA = generalConfig.getBoolean("AutoDeleteInvalidQuestData", false); ENABLE_STORY_QUEST_BUFF_REWARD = generalConfig.getBoolean("StoryQuestRewardBuff", true); MULTIPLE_ITEM_DROP = generalConfig.getBoolean("MultipleItemDrop", true); - FORCE_INVENTORY_UPDATE = generalConfig.getBoolean("ForceInventoryUpdate", false); LAZY_CACHE = generalConfig.getBoolean("LazyCache", true); CHECK_HTML_ENCODING = generalConfig.getBoolean("CheckHtmlEncoding", true); CACHE_CHAR_NAMES = generalConfig.getBoolean("CacheCharNames", true); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/CombatFlag.java index 05640e1621..ade3651048 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -82,16 +81,10 @@ public class CombatFlag _player.sendPacket(sm); // Refresh inventory - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_item); - _player.sendInventoryUpdate(iu); - } - else - { - _player.sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_item); + _player.sendInventoryUpdate(iu); + // Refresh player stats _player.broadcastUserInfo(); _player.setCombatFlagEquipped(true); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/TradeList.java index 4e3b886a94..a132fd519a 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/TradeList.java @@ -591,31 +591,17 @@ public class TradeList else { // Prepare inventory update packet - final InventoryUpdate ownerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); - final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate ownerIU = new InventoryUpdate(); + final InventoryUpdate partnerIU = new InventoryUpdate(); // Transfer items partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); - // Send inventory update packet - if (ownerIU != null) - { - _owner.sendInventoryUpdate(ownerIU); - } - else - { - _owner.sendItemList(); - } + // Send inventory update packets + _owner.sendInventoryUpdate(ownerIU); + _partner.sendInventoryUpdate(partnerIU); - if (partnerIU != null) - { - _partner.sendInventoryUpdate(partnerIU); - } - else - { - _partner.sendItemList(); - } success = true; } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java index e55e9bfde8..2fd52593ef 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -3119,22 +3119,15 @@ public class Player extends Playable _inventory.addAdena(process, count, this, reference); // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) + if (count == getAdena()) { - if (count == getAdena()) - { - sendItemList(); - } - else - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addModifiedItem(_inventory.getAdenaInstance()); - sendInventoryUpdate(iu); - } + sendItemList(); } else { - sendItemList(); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(_inventory.getAdenaInstance()); + sendInventoryUpdate(iu); } } } @@ -3167,16 +3160,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(adenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(adenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3217,16 +3203,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(beautyTickets); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(beautyTickets); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3269,16 +3248,10 @@ public class Player extends Playable if (count > 0) { _inventory.addAncientAdena(process, count, this, reference); - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_inventory.getAncientAdenaInstance()); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_inventory.getAncientAdenaInstance()); + sendInventoryUpdate(iu); } } @@ -3309,16 +3282,9 @@ public class Player extends Playable return false; } - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(ancientAdenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(ancientAdenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3525,23 +3491,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) - { - playerIU.addModifiedItem(destoyedItem); - } - else - { - playerIU.addRemovedItem(destoyedItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(destoyedItem); } else { - sendItemList(); + playerIU.addRemovedItem(destoyedItem); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3641,23 +3600,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > 0)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addRemovedItem(item); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - sendItemList(); + playerIU.addRemovedItem(item); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3703,45 +3655,31 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(oldItem); } else { - sendItemList(); + playerIU.addRemovedItem(oldItem); } + sendInventoryUpdate(playerIU); // Send target update packet if (target instanceof PlayerInventory) { final Player targetPlayer = ((PlayerInventory) target).getOwner(); - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate targetIU = new InventoryUpdate(); + if (newItem.getCount() > count) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (newItem.getCount() > count) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } - targetPlayer.sendPacket(playerIU); + targetIU.addModifiedItem(newItem); } else { - targetPlayer.sendItemList(); + targetIU.addNewItem(newItem); } + targetPlayer.sendPacket(targetIU); } // Einhasad coin UI update. @@ -3837,16 +3775,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(droppedItem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(droppedItem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3917,16 +3848,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(invitem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(invitem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 257a531a9d..1b43c7dc7e 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -424,16 +424,9 @@ public class PlayerInventory extends Inventory if (actor != null) { // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(addedItem); - actor.sendInventoryUpdate(playerIU); - } - else - { - actor.sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(addedItem); + actor.sendInventoryUpdate(playerIU); // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getTemplate()); @@ -490,23 +483,16 @@ public class PlayerInventory extends Inventory // Send inventory update packet if (update) { - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > count)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > count)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addNewItem(item); - } - actor.sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - actor.sendItemList(); + playerIU.addNewItem(item); } + actor.sendInventoryUpdate(playerIU); // Adena UI update. if (item.getId() == Inventory.ADENA_ID) @@ -1191,14 +1177,7 @@ public class PlayerInventory extends Inventory } finally { - if (Config.FORCE_INVENTORY_UPDATE) - { - _owner.sendItemList(); - } - else - { - _owner.sendInventoryUpdate(iu); - } + _owner.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 2f83c2dc85..fed6f3b297 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -161,7 +161,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -176,17 +176,15 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); } + else + { + playerIU.addNewItem(newItem); + } + final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_X_S2); sm.addItemName(item.getId()); sm.addLong(count); @@ -196,10 +194,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket msg.removeAttachments(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index a10fa22a89..41f3160d6a 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -207,22 +207,15 @@ public class RequestDestroyItem implements IClientIncomingPacket return; } - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate iu = new InventoryUpdate(); + if (removedItem.getCount() == 0) { - final InventoryUpdate iu = new InventoryUpdate(); - if (removedItem.getCount() == 0) - { - iu.addRemovedItem(removedItem); - } - else - { - iu.addModifiedItem(removedItem); - } - player.sendInventoryUpdate(iu); + iu.addRemovedItem(removedItem); } else { - player.sendItemList(); + iu.addModifiedItem(removedItem); } + player.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 7113677c9a..90f3dcf874 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -403,7 +403,7 @@ public class RequestEnchantItem implements IClientIncomingPacket player.sendPacket(sm); } - if (!Config.FORCE_INVENTORY_UPDATE && (crystals != null)) + if (crystals != null) { iu.addItem(crystals); } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index aef8ae680f..dd02ade181 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -156,7 +156,7 @@ public class RequestPackageSend implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder i : _items) { // Check validity of requested item @@ -175,16 +175,13 @@ public class RequestPackageSend implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } // Remove item objects from the world. @@ -195,13 +192,6 @@ public class RequestPackageSend implements IClientIncomingPacket warehouse.deleteMe(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index cb28204e5a..5cfbcb7033 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -184,7 +184,7 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -205,16 +205,13 @@ public class RequestPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); + } + else + { + playerIU.addNewItem(newItem); } final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_X_S2); @@ -224,10 +221,8 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 3582b308eb..58cf805178 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -310,7 +310,7 @@ public class RequestSendPost implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (AttachmentItem i : _items) { // Check validity of requested item @@ -328,28 +328,19 @@ public class RequestSendPost implements IClientIncomingPacket continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); - if (playerIU != null) + + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); return true; } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index e64b7c89a8..fe15c9d1b6 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -168,7 +168,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder itemHolder : _items) { // Check validity of requested item @@ -191,27 +191,17 @@ public class SendWareHouseDepositList implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/config/General.ini b/L2J_Mobius_10.2_MasterClass/dist/game/config/General.ini index 33c41c47f0..413d794af8 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/config/General.ini +++ b/L2J_Mobius_10.2_MasterClass/dist/game/config/General.ini @@ -238,12 +238,6 @@ StoryQuestRewardBuff = True # Default: True MultipleItemDrop = True -# Forces full item inventory packet to be sent for any item change. -# Notes: -# This can increase network traffic -# Default: False -ForceInventoryUpdate = False - # True = Load html's into cache only on first time html is requested. # False = Load all html's into cache on server startup. # Default: False diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/Config.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/Config.java index 995a1b4618..cbed4874cb 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/Config.java @@ -470,7 +470,6 @@ public class Config public static boolean AUTODELETE_INVALID_QUEST_DATA; public static boolean ENABLE_STORY_QUEST_BUFF_REWARD; public static boolean MULTIPLE_ITEM_DROP; - public static boolean FORCE_INVENTORY_UPDATE; public static boolean LAZY_CACHE; public static boolean CHECK_HTML_ENCODING; public static boolean CACHE_CHAR_NAMES; @@ -2083,7 +2082,6 @@ public class Config AUTODELETE_INVALID_QUEST_DATA = generalConfig.getBoolean("AutoDeleteInvalidQuestData", false); ENABLE_STORY_QUEST_BUFF_REWARD = generalConfig.getBoolean("StoryQuestRewardBuff", true); MULTIPLE_ITEM_DROP = generalConfig.getBoolean("MultipleItemDrop", true); - FORCE_INVENTORY_UPDATE = generalConfig.getBoolean("ForceInventoryUpdate", false); LAZY_CACHE = generalConfig.getBoolean("LazyCache", true); CHECK_HTML_ENCODING = generalConfig.getBoolean("CheckHtmlEncoding", true); CACHE_CHAR_NAMES = generalConfig.getBoolean("CacheCharNames", true); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/CombatFlag.java index 05640e1621..ade3651048 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -82,16 +81,10 @@ public class CombatFlag _player.sendPacket(sm); // Refresh inventory - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_item); - _player.sendInventoryUpdate(iu); - } - else - { - _player.sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_item); + _player.sendInventoryUpdate(iu); + // Refresh player stats _player.broadcastUserInfo(); _player.setCombatFlagEquipped(true); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/TradeList.java index 4e3b886a94..a132fd519a 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/TradeList.java @@ -591,31 +591,17 @@ public class TradeList else { // Prepare inventory update packet - final InventoryUpdate ownerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); - final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate ownerIU = new InventoryUpdate(); + final InventoryUpdate partnerIU = new InventoryUpdate(); // Transfer items partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); - // Send inventory update packet - if (ownerIU != null) - { - _owner.sendInventoryUpdate(ownerIU); - } - else - { - _owner.sendItemList(); - } + // Send inventory update packets + _owner.sendInventoryUpdate(ownerIU); + _partner.sendInventoryUpdate(partnerIU); - if (partnerIU != null) - { - _partner.sendInventoryUpdate(partnerIU); - } - else - { - _partner.sendItemList(); - } success = true; } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java index c7bdd72e10..5c446e0b0f 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -3119,22 +3119,15 @@ public class Player extends Playable _inventory.addAdena(process, count, this, reference); // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) + if (count == getAdena()) { - if (count == getAdena()) - { - sendItemList(); - } - else - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addModifiedItem(_inventory.getAdenaInstance()); - sendInventoryUpdate(iu); - } + sendItemList(); } else { - sendItemList(); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(_inventory.getAdenaInstance()); + sendInventoryUpdate(iu); } } } @@ -3167,16 +3160,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(adenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(adenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3217,16 +3203,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(beautyTickets); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(beautyTickets); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3269,16 +3248,10 @@ public class Player extends Playable if (count > 0) { _inventory.addAncientAdena(process, count, this, reference); - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_inventory.getAncientAdenaInstance()); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_inventory.getAncientAdenaInstance()); + sendInventoryUpdate(iu); } } @@ -3309,16 +3282,9 @@ public class Player extends Playable return false; } - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(ancientAdenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(ancientAdenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3553,23 +3519,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) - { - playerIU.addModifiedItem(destoyedItem); - } - else - { - playerIU.addRemovedItem(destoyedItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(destoyedItem); } else { - sendItemList(); + playerIU.addRemovedItem(destoyedItem); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3669,23 +3628,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > 0)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addRemovedItem(item); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - sendItemList(); + playerIU.addRemovedItem(item); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3731,45 +3683,31 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(oldItem); } else { - sendItemList(); + playerIU.addRemovedItem(oldItem); } + sendInventoryUpdate(playerIU); // Send target update packet if (target instanceof PlayerInventory) { final Player targetPlayer = ((PlayerInventory) target).getOwner(); - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate targetIU = new InventoryUpdate(); + if (newItem.getCount() > count) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (newItem.getCount() > count) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } - targetPlayer.sendPacket(playerIU); + targetIU.addModifiedItem(newItem); } else { - targetPlayer.sendItemList(); + targetIU.addNewItem(newItem); } + targetPlayer.sendPacket(targetIU); } // Einhasad coin UI update. @@ -3865,16 +3803,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(droppedItem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(droppedItem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3945,16 +3876,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(invitem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(invitem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 257a531a9d..1b43c7dc7e 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -424,16 +424,9 @@ public class PlayerInventory extends Inventory if (actor != null) { // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(addedItem); - actor.sendInventoryUpdate(playerIU); - } - else - { - actor.sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(addedItem); + actor.sendInventoryUpdate(playerIU); // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getTemplate()); @@ -490,23 +483,16 @@ public class PlayerInventory extends Inventory // Send inventory update packet if (update) { - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > count)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > count)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addNewItem(item); - } - actor.sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - actor.sendItemList(); + playerIU.addNewItem(item); } + actor.sendInventoryUpdate(playerIU); // Adena UI update. if (item.getId() == Inventory.ADENA_ID) @@ -1191,14 +1177,7 @@ public class PlayerInventory extends Inventory } finally { - if (Config.FORCE_INVENTORY_UPDATE) - { - _owner.sendItemList(); - } - else - { - _owner.sendInventoryUpdate(iu); - } + _owner.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 2f83c2dc85..fed6f3b297 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -161,7 +161,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -176,17 +176,15 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); } + else + { + playerIU.addNewItem(newItem); + } + final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_X_S2); sm.addItemName(item.getId()); sm.addLong(count); @@ -196,10 +194,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket msg.removeAttachments(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index a10fa22a89..41f3160d6a 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -207,22 +207,15 @@ public class RequestDestroyItem implements IClientIncomingPacket return; } - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate iu = new InventoryUpdate(); + if (removedItem.getCount() == 0) { - final InventoryUpdate iu = new InventoryUpdate(); - if (removedItem.getCount() == 0) - { - iu.addRemovedItem(removedItem); - } - else - { - iu.addModifiedItem(removedItem); - } - player.sendInventoryUpdate(iu); + iu.addRemovedItem(removedItem); } else { - player.sendItemList(); + iu.addModifiedItem(removedItem); } + player.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index aef8ae680f..dd02ade181 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -156,7 +156,7 @@ public class RequestPackageSend implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder i : _items) { // Check validity of requested item @@ -175,16 +175,13 @@ public class RequestPackageSend implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } // Remove item objects from the world. @@ -195,13 +192,6 @@ public class RequestPackageSend implements IClientIncomingPacket warehouse.deleteMe(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index cb28204e5a..5cfbcb7033 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -184,7 +184,7 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -205,16 +205,13 @@ public class RequestPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); + } + else + { + playerIU.addNewItem(newItem); } final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_X_S2); @@ -224,10 +221,8 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 3582b308eb..58cf805178 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -310,7 +310,7 @@ public class RequestSendPost implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (AttachmentItem i : _items) { // Check validity of requested item @@ -328,28 +328,19 @@ public class RequestSendPost implements IClientIncomingPacket continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); - if (playerIU != null) + + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); return true; } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index e64b7c89a8..fe15c9d1b6 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -168,7 +168,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder itemHolder : _items) { // Check validity of requested item @@ -191,27 +191,17 @@ public class SendWareHouseDepositList implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java index 1d8d2c622d..a1b83463c5 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java @@ -405,7 +405,7 @@ public class RequestEnchantItem implements IClientIncomingPacket player.sendPacket(sm); } - if (!Config.FORCE_INVENTORY_UPDATE && (crystals != null)) + if (crystals != null) { iu.addItem(crystals); } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestMultiEnchantItemList.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestMultiEnchantItemList.java index e05db3d047..276d4ce534 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestMultiEnchantItemList.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestMultiEnchantItemList.java @@ -277,7 +277,7 @@ public class ExRequestMultiEnchantItemList implements IClientIncomingPacket _failureReward.put(_failureReward.size() + 1, itemHolder); } - if (!Config.FORCE_INVENTORY_UPDATE && (crystals != null)) + if (crystals != null) { iu.addItem(crystals); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/General.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/General.ini index 7e2ff1231a..5f94d24136 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/General.ini +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/General.ini @@ -554,10 +554,6 @@ PreciseDropCalculation = False # Allow create spliced things MultipleItemDrop = True -# Sending information about all the things your character, and not only that with which the operation takes place. -# WARNING: Incredible traffic loads. -ForceInventoryUpdate = False - # Sending information about all the stats your character, and not only that with which the operation takes place. # WARNING: Higher traffic loads. ForceCompletePlayerStatusUpdate = True diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/Config.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/Config.java index d4ac3d84b0..c1c2a0d1b7 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/Config.java @@ -319,7 +319,6 @@ public class Config public static int RIFT_ENTER_COST_COMMANDER; public static int RIFT_ENTER_COST_HERO; public static float RIFT_BOSS_ROOM_TIME_MUTIPLY; - public static boolean FORCE_INVENTORY_UPDATE; public static boolean ALT_GAME_KARMA_PLAYER_CAN_BE_KILLED_IN_PEACEZONE; public static boolean ALT_GAME_KARMA_PLAYER_CAN_SHOP; public static boolean ALT_GAME_KARMA_PLAYER_CAN_USE_GK; @@ -1488,7 +1487,6 @@ public class Config SHOW_NPC_AGGRESSION = generalConfig.getBoolean("ShowNpcAggression", false); SHOW_NPC_CLAN_CREST = generalConfig.getBoolean("ShowNpcClanCrest", false); ATTACKABLES_CAMP_PLAYER_CORPSES = generalConfig.getBoolean("AttackablesCampPlayerCorpses", false); - FORCE_INVENTORY_UPDATE = generalConfig.getBoolean("ForceInventoryUpdate", false); FORCE_COMPLETE_STATUS_UPDATE = generalConfig.getBoolean("ForceCompletePlayerStatusUpdate", true); CHAR_DATA_STORE_INTERVAL = generalConfig.getInt("CharacterDataStoreInterval", 15) * 60 * 1000; UPDATE_ITEMS_ON_CHAR_STORE = generalConfig.getBoolean("UpdateItemsOnCharStore", false); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Charge.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Charge.java index 1b8f6084c3..32323f6a21 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Charge.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Charge.java @@ -20,7 +20,6 @@ import java.util.List; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.Effect; @@ -36,13 +35,13 @@ public class Charge implements ISkillHandler @Override public void useSkill(Creature creature, Skill skill, List targets) { - for (WorldObject target1 : targets) + for (Creature target : targets) { - if (!(target1 instanceof Player)) + if (!(target instanceof Player)) { continue; } - final Player target = (Player) target1; + skill.applyEffects(creature, target, false, false, false); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Harvest.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Harvest.java index be041b028f..792ad173c8 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Harvest.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Harvest.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.handler.skillhandlers; import java.util.List; -import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; @@ -31,7 +30,6 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; /** @@ -58,7 +56,7 @@ public class Harvest implements ISkillHandler _player = (Player) creature; final List targetList = skill.getTargetList(creature); - final InventoryUpdate iu = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); if (targetList == null) { return; @@ -100,10 +98,7 @@ public class Harvest implements ISkillHandler else { final Item item = _player.getInventory().addItem("Manor", ritem.getId(), ritem.getCount(), _player, _target); - if (iu != null) - { - iu.addItem(item); - } + iu.addItem(item); send = true; total += ritem.getCount(); } @@ -124,14 +119,7 @@ public class Harvest implements ISkillHandler _player.getParty().broadcastToPartyMembers(_player, smsg); } - if (iu != null) - { - _player.sendPacket(iu); - } - else - { - _player.sendPacket(new ItemList(_player, false)); - } + _player.sendPacket(iu); } } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Recall.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Recall.java index b7ba040c56..33ec3c5848 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Recall.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Recall.java @@ -22,7 +22,6 @@ import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.skill.SkillType; @@ -71,14 +70,8 @@ public class Recall implements ISkillHandler } } - for (WorldObject target1 : targets) + for (Creature target : targets) { - if (!(target1 instanceof Creature)) - { - continue; - } - - final Creature target = (Creature) target1; if (target instanceof Player) { final Player targetChar = (Player) target; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Spoil.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Spoil.java index d49ecc979e..78aa6e50f1 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Spoil.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Spoil.java @@ -21,7 +21,6 @@ import java.util.List; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; @@ -53,7 +52,7 @@ public class Spoil implements ISkillHandler return; } - for (WorldObject target1 : targets) + for (Creature target1 : targets) { if (!(target1 instanceof Monster)) { @@ -70,7 +69,7 @@ public class Spoil implements ISkillHandler boolean spoil = false; if (!target.isDead()) { - spoil = Formulas.calcMagicSuccess(creature, (Creature) target1, skill); + spoil = Formulas.calcMagicSuccess(creature, target1, skill); if (spoil) { target.setSpoil(true); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Sweep.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Sweep.java index f85338cc01..0f03c19701 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Sweep.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Sweep.java @@ -18,10 +18,8 @@ package org.l2jmobius.gameserver.handler.skillhandlers; import java.util.List; -import org.l2jmobius.Config; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; @@ -30,7 +28,6 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; /** @@ -52,9 +49,9 @@ public class Sweep implements ISkillHandler } final Player player = (Player) creature; - final InventoryUpdate iu = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); boolean send = false; - for (WorldObject target1 : targets) + for (Creature target1 : targets) { if (!(target1 instanceof Attackable)) { @@ -88,10 +85,7 @@ public class Sweep implements ISkillHandler else { final Item item = player.getInventory().addItem("Sweep", ritem.getId(), ritem.getCount(), player, target); - if (iu != null) - { - iu.addItem(item); - } + iu.addItem(item); send = true; SystemMessage smsg; if (ritem.getCount() > 1) @@ -113,14 +107,7 @@ public class Sweep implements ISkillHandler if (send) { - if (iu != null) - { - player.sendPacket(iu); - } - else - { - player.sendPacket(new ItemList(player, false)); - } + player.sendPacket(iu); } } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/ZakenPlayer.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/ZakenPlayer.java index 101cfdb89a..8b85fcf726 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/ZakenPlayer.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/ZakenPlayer.java @@ -21,7 +21,6 @@ import java.util.List; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skill.SkillType; @@ -37,14 +36,8 @@ public class ZakenPlayer implements ISkillHandler { try { - for (WorldObject target1 : targets) + for (Creature target : targets) { - if (!(target1 instanceof Creature)) - { - continue; - } - - final Creature target = (Creature) target1; switch (Rnd.get(14) + 1) { case 1: diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/ZakenSelf.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/ZakenSelf.java index 57d59d222b..26cf3dfa2f 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/ZakenSelf.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/ZakenSelf.java @@ -21,7 +21,6 @@ import java.util.List; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skill.SkillType; @@ -37,14 +36,8 @@ public class ZakenSelf implements ISkillHandler { try { - for (WorldObject target1 : targets) + for (Creature target : targets) { - if (!(target1 instanceof Creature)) - { - continue; - } - - final Creature target = (Creature) target1; switch (Rnd.get(14) + 1) { case 1: diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/CombatFlag.java index c3f48be791..72231ab104 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -16,14 +16,12 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; /** @@ -96,16 +94,9 @@ public class CombatFlag _player.sendPacket(sm); // Refresh inventory - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_item); - _player.sendPacket(iu); - } - else - { - _player.sendPacket(new ItemList(_player, false)); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_item); + _player.sendPacket(iu); // Refresh player stats _player.broadcastUserInfo(); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/TradeList.java index 425d45727a..d0bab1e3b8 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/TradeList.java @@ -31,7 +31,6 @@ import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Util; @@ -760,31 +759,16 @@ public class TradeList else { // Prepare inventory update packet - final InventoryUpdate ownerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); - final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate ownerIU = new InventoryUpdate(); + final InventoryUpdate partnerIU = new InventoryUpdate(); // Transfer items partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); // Send inventory update packet - if (ownerIU != null) - { - _owner.sendPacket(ownerIU); - } - else - { - _owner.sendPacket(new ItemList(_owner, false)); - } - - if (partnerIU != null) - { - _partner.sendPacket(partnerIU); - } - else - { - _partner.sendPacket(new ItemList(_partner, false)); - } + _owner.sendPacket(ownerIU); + _partner.sendPacket(partnerIU); // Update current load as well StatusUpdate playerSU = new StatusUpdate(_owner.getObjectId()); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java index e10bc09130..b3eff9b4d6 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -3223,22 +3223,15 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) + if (count == getAdena()) { - if (count == getAdena()) - { - sendPacket(new ItemList(this, false)); - } - else - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addModifiedItem(_inventory.getAdenaInstance()); - sendPacket(iu); - } + sendPacket(new ItemList(this, false)); } else { - sendPacket(new ItemList(this, false)); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(_inventory.getAdenaInstance()); + sendPacket(iu); } } } @@ -3268,16 +3261,9 @@ public class Player extends Playable _inventory.reduceAdena(process, count, this, reference); // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(adenaItem); - sendPacket(iu); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(adenaItem); + sendPacket(iu); if (sendMessage) { @@ -3310,16 +3296,10 @@ public class Player extends Playable if (count > 0) { _inventory.addAncientAdena(process, count, this, reference); - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_inventory.getAncientAdenaInstance()); - sendPacket(iu); - } - else - { - sendPacket(new ItemList(this, false)); - } + + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_inventory.getAncientAdenaInstance()); + sendPacket(iu); } } @@ -3346,16 +3326,10 @@ public class Player extends Playable { final Item ancientAdenaItem = _inventory.getAncientAdenaInstance(); _inventory.reduceAncientAdena(process, count, this, reference); - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(ancientAdenaItem); - sendPacket(iu); - } - else - { - sendPacket(new ItemList(this, false)); - } + + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(ancientAdenaItem); + sendPacket(iu); if (sendMessage) { @@ -3418,16 +3392,9 @@ public class Player extends Playable final Item newitem = _inventory.addItem(process, item, this, reference); // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(newitem); - sendPacket(playerIU); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(newitem); + sendPacket(playerIU); // Update current load as well final StatusUpdate su = new StatusUpdate(getObjectId()); @@ -3530,16 +3497,9 @@ public class Player extends Playable final Item item = _inventory.addItem(process, itemId, count, this, reference); // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(item); - sendPacket(playerIU); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(item); + sendPacket(playerIU); // Update current load as well final StatusUpdate su = new StatusUpdate(getObjectId()); @@ -3576,16 +3536,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(destoyedItem); - sendPacket(playerIU); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(destoyedItem); + sendPacket(playerIU); // Update current load as well final StatusUpdate su = new StatusUpdate(getObjectId()); @@ -3636,16 +3589,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(item); - sendPacket(playerIU); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(item); + sendPacket(playerIU); // Update current load as well final StatusUpdate su = new StatusUpdate(getObjectId()); @@ -3711,16 +3657,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(item); - sendPacket(playerIU); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(item); + sendPacket(playerIU); // Update current load as well final StatusUpdate su = new StatusUpdate(getObjectId()); @@ -3763,16 +3702,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(item); - sendPacket(playerIU); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(item); + sendPacket(playerIU); // Update current load as well final StatusUpdate su = new StatusUpdate(getObjectId()); @@ -3871,23 +3803,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } - sendPacket(playerIU); + playerIU.addModifiedItem(oldItem); } else { - sendPacket(new ItemList(this, false)); + playerIU.addRemovedItem(oldItem); } + sendPacket(playerIU); // Update current load as well StatusUpdate playerSU = new StatusUpdate(getObjectId()); @@ -3898,23 +3823,16 @@ public class Player extends Playable if (target instanceof PlayerInventory) { final Player targetPlayer = ((PlayerInventory) target).getOwner(); - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate targetIU = new InventoryUpdate(); + if (newItem.getCount() > count) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (newItem.getCount() > count) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } - targetPlayer.sendPacket(playerIU); + targetIU.addModifiedItem(newItem); } else { - targetPlayer.sendPacket(new ItemList(targetPlayer, false)); + targetIU.addNewItem(newItem); } + targetPlayer.sendPacket(targetIU); // Update current load as well playerSU = new StatusUpdate(targetPlayer.getObjectId()); @@ -3988,16 +3906,9 @@ public class Player extends Playable } // Send inventory update packet. - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(droppedItem); - sendPacket(playerIU); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(droppedItem); + sendPacket(playerIU); // Update current load as well. final StatusUpdate su = new StatusUpdate(getObjectId()); @@ -4069,16 +3980,9 @@ public class Player extends Playable } // Send inventory update packet. - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(inventoryItem); - sendPacket(playerIU); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(inventoryItem); + sendPacket(playerIU); // Update current load as well. final StatusUpdate su = new StatusUpdate(getObjectId()); @@ -5978,12 +5882,9 @@ public class Player extends Playable sendMessage("You have earned " + amount + " item(s) of " + reward.getName() + "."); } - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_inventory.getItemByItemId(Config.PVP_REWARD_ID)); - sendPacket(iu); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_inventory.getItemByItemId(Config.PVP_REWARD_ID)); + sendPacket(iu); } else // target is not pk and not in pvp ---> PK KILL { @@ -5996,12 +5897,9 @@ public class Player extends Playable sendMessage("You have earned " + amount + " item(s) of " + reward.getName() + "."); } - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_inventory.getItemByItemId(Config.PK_REWARD_ID)); - sendPacket(iu); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_inventory.getItemByItemId(Config.PK_REWARD_ID)); + sendPacket(iu); } } else @@ -6787,16 +6685,10 @@ public class Player extends Playable _arrowItem = null; sendPacket(new ItemList(this, false)); } - else if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addModifiedItem(arrows); - sendPacket(iu); - } - else - { - sendPacket(new ItemList(this, false)); - } + + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(arrows); + sendPacket(iu); } /** 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 287e597e9c..097e7c3054 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 @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.World; @@ -29,7 +28,6 @@ import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.IllegalPlayerAction; @@ -188,34 +186,26 @@ public class RequestCrystallizeItem implements IClientIncomingPacket player.sendPacket(sm); // send inventory update - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate iu = new InventoryUpdate(); + if (removedItem.getCount() == 0) { - final InventoryUpdate iu = new InventoryUpdate(); - if (removedItem.getCount() == 0) - { - iu.addRemovedItem(removedItem); - } - else - { - iu.addModifiedItem(removedItem); - } - - if (createditem.getCount() != crystalAmount) - { - iu.addModifiedItem(createditem); - } - else - { - iu.addNewItem(createditem); - } - - player.sendPacket(iu); + iu.addRemovedItem(removedItem); } else { - player.sendPacket(new ItemList(player, false)); + iu.addModifiedItem(removedItem); } + if (createditem.getCount() != crystalAmount) + { + iu.addModifiedItem(createditem); + } + else + { + iu.addNewItem(createditem); + } + player.sendPacket(iu); + // status & user info final StatusUpdate su = new StatusUpdate(player.getObjectId()); su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad()); 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 9d2e6bd449..b08023bfb1 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 @@ -29,7 +29,6 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.util.Util; @@ -149,25 +148,16 @@ public class RequestDestroyItem implements IClientIncomingPacket return; } - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate iu = new InventoryUpdate(); + if (removedItem.getCount() == 0) { - final InventoryUpdate iu = new InventoryUpdate(); - if (removedItem.getCount() == 0) - { - iu.addRemovedItem(removedItem); - } - else - { - iu.addModifiedItem(removedItem); - } - - // client.getConnection().sendPacket(iu); - player.sendPacket(iu); + iu.addRemovedItem(removedItem); } else { - player.sendPacket(new ItemList(player, true)); + iu.addModifiedItem(removedItem); } + player.sendPacket(iu); final StatusUpdate su = new StatusUpdate(player.getObjectId()); su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad()); 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 0156147489..9fa5339339 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 @@ -710,25 +710,17 @@ public class RequestEnchantItem implements IClientIncomingPacket sm.addNumber(count); player.sendPacket(sm); - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate iu = new InventoryUpdate(); + if (destroyItem.getCount() == 0) { - final InventoryUpdate iu = new InventoryUpdate(); - if (destroyItem.getCount() == 0) - { - iu.addRemovedItem(destroyItem); - } - else - { - iu.addModifiedItem(destroyItem); - } - iu.addItem(crystals); - - player.sendPacket(iu); + iu.addRemovedItem(destroyItem); } else { - player.sendPacket(new ItemList(player, true)); + iu.addModifiedItem(destroyItem); } + iu.addItem(crystals); + player.sendPacket(iu); final StatusUpdate su = new StatusUpdate(player.getObjectId()); su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad()); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index a13411d348..6a21b04c0d 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -34,7 +34,6 @@ import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; /** @@ -192,7 +191,7 @@ public class RequestPackageSend implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder i : _items) { final int objectId = i.id; @@ -224,28 +223,18 @@ public class RequestPackageSend implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendPacket(playerIU); - } - else - { - player.sendPacket(new ItemList(player, false)); - } + player.sendPacket(playerIU); // Update current load status on player final StatusUpdate su = new StatusUpdate(player.getObjectId()); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index bd91a4571d..33cfd2b005 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -32,7 +32,6 @@ import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.EnchantResult; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; public class SendWareHouseDepositList implements IClientIncomingPacket @@ -209,7 +208,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (int i = 0; i < _count; i++) { final int objectId = _items[(i * 2) + 0]; @@ -246,28 +245,18 @@ public class SendWareHouseDepositList implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendPacket(playerIU); - } - else - { - player.sendPacket(new ItemList(player, false)); - } + player.sendPacket(playerIU); // Update current load status on player final StatusUpdate su = new StatusUpdate(player.getObjectId()); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index bbe25ef079..aae2abb9e6 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -31,7 +31,6 @@ import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.EnchantResult; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.util.Util; @@ -180,7 +179,7 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (int i = 0; i < _count; i++) { final int objectId = _items[(i * 2) + 0]; @@ -197,28 +196,18 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket continue; } - if (playerIU != null) + if (newItem.getCount() > count) { - if (newItem.getCount() > count) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); + } + else + { + playerIU.addNewItem(newItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendPacket(playerIU); - } - else - { - player.sendPacket(new ItemList(player, false)); - } + player.sendPacket(playerIU); // Update current load status on player final StatusUpdate su = new StatusUpdate(player.getObjectId()); diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/General.ini b/L2J_Mobius_C6_Interlude/dist/game/config/General.ini index 388f5ad824..36327bbb61 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/config/General.ini +++ b/L2J_Mobius_C6_Interlude/dist/game/config/General.ini @@ -582,10 +582,6 @@ PreciseDropCalculation = False # Allow create spliced things MultipleItemDrop = True -# Sending information about all the things your character, and not only that with which the operation takes place. -# WARNING: Incredible traffic loads. -ForceInventoryUpdate = False - # Sending information about all the stats your character, and not only that with which the operation takes place. # WARNING: Higher traffic loads. ForceCompletePlayerStatusUpdate = True diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java index 7a275e249a..4be6fbd3e3 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java @@ -346,7 +346,6 @@ public class Config public static int RIFT_ENTER_COST_COMMANDER; public static int RIFT_ENTER_COST_HERO; public static float RIFT_BOSS_ROOM_TIME_MUTIPLY; - public static boolean FORCE_INVENTORY_UPDATE; public static boolean ALT_GAME_KARMA_PLAYER_CAN_BE_KILLED_IN_PEACEZONE; public static boolean ALT_GAME_KARMA_PLAYER_CAN_SHOP; public static boolean ALT_GAME_KARMA_PLAYER_CAN_USE_GK; @@ -1541,7 +1540,6 @@ public class Config SHOW_NPC_AGGRESSION = generalConfig.getBoolean("ShowNpcAggression", false); SHOW_NPC_CLAN_CREST = generalConfig.getBoolean("ShowNpcClanCrest", false); ATTACKABLES_CAMP_PLAYER_CORPSES = generalConfig.getBoolean("AttackablesCampPlayerCorpses", false); - FORCE_INVENTORY_UPDATE = generalConfig.getBoolean("ForceInventoryUpdate", false); FORCE_COMPLETE_STATUS_UPDATE = generalConfig.getBoolean("ForceCompletePlayerStatusUpdate", true); CHAR_DATA_STORE_INTERVAL = generalConfig.getInt("CharacterDataStoreInterval", 15) * 60 * 1000; UPDATE_ITEMS_ON_CHAR_STORE = generalConfig.getBoolean("UpdateItemsOnCharStore", false); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Charge.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Charge.java index 1b8f6084c3..32323f6a21 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Charge.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Charge.java @@ -20,7 +20,6 @@ import java.util.List; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.Effect; @@ -36,13 +35,13 @@ public class Charge implements ISkillHandler @Override public void useSkill(Creature creature, Skill skill, List targets) { - for (WorldObject target1 : targets) + for (Creature target : targets) { - if (!(target1 instanceof Player)) + if (!(target instanceof Player)) { continue; } - final Player target = (Player) target1; + skill.applyEffects(creature, target, false, false, false); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Harvest.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Harvest.java index be041b028f..792ad173c8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Harvest.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Harvest.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.handler.skillhandlers; import java.util.List; -import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; @@ -31,7 +30,6 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; /** @@ -58,7 +56,7 @@ public class Harvest implements ISkillHandler _player = (Player) creature; final List targetList = skill.getTargetList(creature); - final InventoryUpdate iu = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); if (targetList == null) { return; @@ -100,10 +98,7 @@ public class Harvest implements ISkillHandler else { final Item item = _player.getInventory().addItem("Manor", ritem.getId(), ritem.getCount(), _player, _target); - if (iu != null) - { - iu.addItem(item); - } + iu.addItem(item); send = true; total += ritem.getCount(); } @@ -124,14 +119,7 @@ public class Harvest implements ISkillHandler _player.getParty().broadcastToPartyMembers(_player, smsg); } - if (iu != null) - { - _player.sendPacket(iu); - } - else - { - _player.sendPacket(new ItemList(_player, false)); - } + _player.sendPacket(iu); } } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Recall.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Recall.java index ed405a599e..316d52d792 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Recall.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Recall.java @@ -22,7 +22,6 @@ import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.skill.SkillType; @@ -71,14 +70,8 @@ public class Recall implements ISkillHandler } } - for (WorldObject target1 : targets) + for (Creature target : targets) { - if (!(target1 instanceof Creature)) - { - continue; - } - - final Creature target = (Creature) target1; if (target instanceof Player) { final Player targetChar = (Player) target; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Spoil.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Spoil.java index d49ecc979e..78aa6e50f1 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Spoil.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Spoil.java @@ -21,7 +21,6 @@ import java.util.List; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; @@ -53,7 +52,7 @@ public class Spoil implements ISkillHandler return; } - for (WorldObject target1 : targets) + for (Creature target1 : targets) { if (!(target1 instanceof Monster)) { @@ -70,7 +69,7 @@ public class Spoil implements ISkillHandler boolean spoil = false; if (!target.isDead()) { - spoil = Formulas.calcMagicSuccess(creature, (Creature) target1, skill); + spoil = Formulas.calcMagicSuccess(creature, target1, skill); if (spoil) { target.setSpoil(true); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Sweep.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Sweep.java index f85338cc01..0f03c19701 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Sweep.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Sweep.java @@ -18,10 +18,8 @@ package org.l2jmobius.gameserver.handler.skillhandlers; import java.util.List; -import org.l2jmobius.Config; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; @@ -30,7 +28,6 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.SkillType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; /** @@ -52,9 +49,9 @@ public class Sweep implements ISkillHandler } final Player player = (Player) creature; - final InventoryUpdate iu = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate iu = new InventoryUpdate(); boolean send = false; - for (WorldObject target1 : targets) + for (Creature target1 : targets) { if (!(target1 instanceof Attackable)) { @@ -88,10 +85,7 @@ public class Sweep implements ISkillHandler else { final Item item = player.getInventory().addItem("Sweep", ritem.getId(), ritem.getCount(), player, target); - if (iu != null) - { - iu.addItem(item); - } + iu.addItem(item); send = true; SystemMessage smsg; if (ritem.getCount() > 1) @@ -113,14 +107,7 @@ public class Sweep implements ISkillHandler if (send) { - if (iu != null) - { - player.sendPacket(iu); - } - else - { - player.sendPacket(new ItemList(player, false)); - } + player.sendPacket(iu); } } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ZakenPlayer.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ZakenPlayer.java index 101cfdb89a..8b85fcf726 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ZakenPlayer.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ZakenPlayer.java @@ -21,7 +21,6 @@ import java.util.List; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skill.SkillType; @@ -37,14 +36,8 @@ public class ZakenPlayer implements ISkillHandler { try { - for (WorldObject target1 : targets) + for (Creature target : targets) { - if (!(target1 instanceof Creature)) - { - continue; - } - - final Creature target = (Creature) target1; switch (Rnd.get(14) + 1) { case 1: diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ZakenSelf.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ZakenSelf.java index 57d59d222b..26cf3dfa2f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ZakenSelf.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ZakenSelf.java @@ -21,7 +21,6 @@ import java.util.List; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.handler.ISkillHandler; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.skill.SkillType; @@ -37,14 +36,8 @@ public class ZakenSelf implements ISkillHandler { try { - for (WorldObject target1 : targets) + for (Creature target : targets) { - if (!(target1 instanceof Creature)) - { - continue; - } - - final Creature target = (Creature) target1; switch (Rnd.get(14) + 1) { case 1: diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CombatFlag.java index c3f48be791..72231ab104 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -16,14 +16,12 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; /** @@ -96,16 +94,9 @@ public class CombatFlag _player.sendPacket(sm); // Refresh inventory - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_item); - _player.sendPacket(iu); - } - else - { - _player.sendPacket(new ItemList(_player, false)); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_item); + _player.sendPacket(iu); // Refresh player stats _player.broadcastUserInfo(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java index 86bb603b46..3e62fdc84c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java @@ -31,7 +31,6 @@ import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Util; @@ -772,31 +771,16 @@ public class TradeList else { // Prepare inventory update packet - final InventoryUpdate ownerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); - final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate ownerIU = new InventoryUpdate(); + final InventoryUpdate partnerIU = new InventoryUpdate(); // Transfer items partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); // Send inventory update packet - if (ownerIU != null) - { - _owner.sendPacket(ownerIU); - } - else - { - _owner.sendPacket(new ItemList(_owner, false)); - } - - if (partnerIU != null) - { - _partner.sendPacket(partnerIU); - } - else - { - _partner.sendPacket(new ItemList(_partner, false)); - } + _owner.sendPacket(ownerIU); + _partner.sendPacket(partnerIU); // Update current load as well StatusUpdate playerSU = new StatusUpdate(_owner.getObjectId()); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java index d93ab5e477..899f011f68 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -3291,22 +3291,15 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) + if (count == getAdena()) { - if (count == getAdena()) - { - sendPacket(new ItemList(this, false)); - } - else - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addModifiedItem(_inventory.getAdenaInstance()); - sendPacket(iu); - } + sendPacket(new ItemList(this, false)); } else { - sendPacket(new ItemList(this, false)); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(_inventory.getAdenaInstance()); + sendPacket(iu); } } } @@ -3336,16 +3329,9 @@ public class Player extends Playable _inventory.reduceAdena(process, count, this, reference); // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(adenaItem); - sendPacket(iu); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(adenaItem); + sendPacket(iu); if (sendMessage) { @@ -3378,16 +3364,10 @@ public class Player extends Playable if (count > 0) { _inventory.addAncientAdena(process, count, this, reference); - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_inventory.getAncientAdenaInstance()); - sendPacket(iu); - } - else - { - sendPacket(new ItemList(this, false)); - } + + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_inventory.getAncientAdenaInstance()); + sendPacket(iu); } } @@ -3414,16 +3394,10 @@ public class Player extends Playable { final Item ancientAdenaItem = _inventory.getAncientAdenaInstance(); _inventory.reduceAncientAdena(process, count, this, reference); - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(ancientAdenaItem); - sendPacket(iu); - } - else - { - sendPacket(new ItemList(this, false)); - } + + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(ancientAdenaItem); + sendPacket(iu); if (sendMessage) { @@ -3486,16 +3460,9 @@ public class Player extends Playable final Item newitem = _inventory.addItem(process, item, this, reference); // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(newitem); - sendPacket(playerIU); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(newitem); + sendPacket(playerIU); // Update current load as well final StatusUpdate su = new StatusUpdate(getObjectId()); @@ -3602,16 +3569,9 @@ public class Player extends Playable final Item item = _inventory.addItem(process, itemId, count, this, reference); // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(item); - sendPacket(playerIU); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(item); + sendPacket(playerIU); // Update current load as well final StatusUpdate su = new StatusUpdate(getObjectId()); @@ -3652,16 +3612,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(destoyedItem); - sendPacket(playerIU); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(destoyedItem); + sendPacket(playerIU); // Update current load as well final StatusUpdate su = new StatusUpdate(getObjectId()); @@ -3712,16 +3665,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(item); - sendPacket(playerIU); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(item); + sendPacket(playerIU); // Update current load as well final StatusUpdate su = new StatusUpdate(getObjectId()); @@ -3787,16 +3733,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(item); - sendPacket(playerIU); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(item); + sendPacket(playerIU); // Update current load as well final StatusUpdate su = new StatusUpdate(getObjectId()); @@ -3839,16 +3778,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(item); - sendPacket(playerIU); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(item); + sendPacket(playerIU); // Update current load as well final StatusUpdate su = new StatusUpdate(getObjectId()); @@ -3947,23 +3879,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } - sendPacket(playerIU); + playerIU.addModifiedItem(oldItem); } else { - sendPacket(new ItemList(this, false)); + playerIU.addRemovedItem(oldItem); } + sendPacket(playerIU); // Update current load as well StatusUpdate playerSU = new StatusUpdate(getObjectId()); @@ -3974,23 +3899,16 @@ public class Player extends Playable if (target instanceof PlayerInventory) { final Player targetPlayer = ((PlayerInventory) target).getOwner(); - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate targetIU = new InventoryUpdate(); + if (newItem.getCount() > count) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (newItem.getCount() > count) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } - targetPlayer.sendPacket(playerIU); + targetIU.addModifiedItem(newItem); } else { - targetPlayer.sendPacket(new ItemList(targetPlayer, false)); + targetIU.addNewItem(newItem); } + targetPlayer.sendPacket(targetIU); // Update current load as well playerSU = new StatusUpdate(targetPlayer.getObjectId()); @@ -4064,16 +3982,9 @@ public class Player extends Playable } // Send inventory update packet. - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(droppedItem); - sendPacket(playerIU); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(droppedItem); + sendPacket(playerIU); // Update current load as well. final StatusUpdate su = new StatusUpdate(getObjectId()); @@ -4145,16 +4056,9 @@ public class Player extends Playable } // Send inventory update packet. - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(inventoryItem); - sendPacket(playerIU); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(inventoryItem); + sendPacket(playerIU); // Update current load as well. final StatusUpdate su = new StatusUpdate(getObjectId()); @@ -6117,12 +6021,9 @@ public class Player extends Playable sendMessage("You have earned " + amount + " item(s) of " + reward.getName() + "."); } - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_inventory.getItemByItemId(Config.PVP_REWARD_ID)); - sendPacket(iu); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_inventory.getItemByItemId(Config.PVP_REWARD_ID)); + sendPacket(iu); } else // target is not pk and not in pvp ---> PK KILL { @@ -6135,12 +6036,9 @@ public class Player extends Playable sendMessage("You have earned " + amount + " item(s) of " + reward.getName() + "."); } - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_inventory.getItemByItemId(Config.PK_REWARD_ID)); - sendPacket(iu); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_inventory.getItemByItemId(Config.PK_REWARD_ID)); + sendPacket(iu); } } else @@ -6926,16 +6824,10 @@ public class Player extends Playable _arrowItem = null; sendPacket(new ItemList(this, false)); } - else if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addModifiedItem(arrows); - sendPacket(iu); - } - else - { - sendPacket(new ItemList(this, false)); - } + + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(arrows); + sendPacket(iu); } /** 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 d2fea2a535..0b5504b204 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 @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.World; @@ -29,7 +28,6 @@ import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.IllegalPlayerAction; @@ -193,34 +191,26 @@ public class RequestCrystallizeItem implements IClientIncomingPacket player.sendPacket(sm); // send inventory update - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate iu = new InventoryUpdate(); + if (removedItem.getCount() == 0) { - final InventoryUpdate iu = new InventoryUpdate(); - if (removedItem.getCount() == 0) - { - iu.addRemovedItem(removedItem); - } - else - { - iu.addModifiedItem(removedItem); - } - - if (createditem.getCount() != crystalAmount) - { - iu.addModifiedItem(createditem); - } - else - { - iu.addNewItem(createditem); - } - - player.sendPacket(iu); + iu.addRemovedItem(removedItem); } else { - player.sendPacket(new ItemList(player, false)); + iu.addModifiedItem(removedItem); } + if (createditem.getCount() != crystalAmount) + { + iu.addModifiedItem(createditem); + } + else + { + iu.addNewItem(createditem); + } + player.sendPacket(iu); + // status & user info final StatusUpdate su = new StatusUpdate(player.getObjectId()); su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad()); 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 8d3ff22247..59838e72ea 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 @@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.util.Util; @@ -155,25 +154,16 @@ public class RequestDestroyItem implements IClientIncomingPacket return; } - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate iu = new InventoryUpdate(); + if (removedItem.getCount() == 0) { - final InventoryUpdate iu = new InventoryUpdate(); - if (removedItem.getCount() == 0) - { - iu.addRemovedItem(removedItem); - } - else - { - iu.addModifiedItem(removedItem); - } - - // client.getConnection().sendPacket(iu); - player.sendPacket(iu); + iu.addRemovedItem(removedItem); } else { - player.sendPacket(new ItemList(player, true)); + iu.addModifiedItem(removedItem); } + player.sendPacket(iu); final StatusUpdate su = new StatusUpdate(player.getObjectId()); su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad()); 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 59cff45037..3f8e253133 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 @@ -715,25 +715,17 @@ public class RequestEnchantItem implements IClientIncomingPacket sm.addNumber(count); player.sendPacket(sm); - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate iu = new InventoryUpdate(); + if (destroyItem.getCount() == 0) { - final InventoryUpdate iu = new InventoryUpdate(); - if (destroyItem.getCount() == 0) - { - iu.addRemovedItem(destroyItem); - } - else - { - iu.addModifiedItem(destroyItem); - } - iu.addItem(crystals); - - player.sendPacket(iu); + iu.addRemovedItem(destroyItem); } else { - player.sendPacket(new ItemList(player, true)); + iu.addModifiedItem(destroyItem); } + iu.addItem(crystals); + player.sendPacket(iu); final StatusUpdate su = new StatusUpdate(player.getObjectId()); su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad()); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index b3a32975b0..262f908f5f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -34,7 +34,6 @@ import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; /** @@ -199,7 +198,7 @@ public class RequestPackageSend implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder i : _items) { final int objectId = i.id; @@ -231,28 +230,18 @@ public class RequestPackageSend implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendPacket(playerIU); - } - else - { - player.sendPacket(new ItemList(player, false)); - } + player.sendPacket(playerIU); // Update current load status on player final StatusUpdate su = new StatusUpdate(player.getObjectId()); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index f3fc60157c..1363878857 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.EnchantResult; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; public class SendWareHouseDepositList implements IClientIncomingPacket @@ -210,7 +209,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (int i = 0; i < _count; i++) { final int objectId = _items[(i * 2) + 0]; @@ -253,28 +252,18 @@ public class SendWareHouseDepositList implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendPacket(playerIU); - } - else - { - player.sendPacket(new ItemList(player, false)); - } + player.sendPacket(playerIU); // Update current load status on player final StatusUpdate su = new StatusUpdate(player.getObjectId()); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index bbe25ef079..aae2abb9e6 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -31,7 +31,6 @@ import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.EnchantResult; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.util.Util; @@ -180,7 +179,7 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (int i = 0; i < _count; i++) { final int objectId = _items[(i * 2) + 0]; @@ -197,28 +196,18 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket continue; } - if (playerIU != null) + if (newItem.getCount() > count) { - if (newItem.getCount() > count) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); + } + else + { + playerIU.addNewItem(newItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendPacket(playerIU); - } - else - { - player.sendPacket(new ItemList(player, false)); - } + player.sendPacket(playerIU); // Update current load status on player final StatusUpdate su = new StatusUpdate(player.getObjectId()); diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/config/General.ini b/L2J_Mobius_CT_0_Interlude/dist/game/config/General.ini index c8d65965d5..527aeaef32 100644 --- a/L2J_Mobius_CT_0_Interlude/dist/game/config/General.ini +++ b/L2J_Mobius_CT_0_Interlude/dist/game/config/General.ini @@ -227,12 +227,6 @@ AutoDeleteInvalidQuestData = False # Default: True MultipleItemDrop = True -# Forces full item inventory packet to be sent for any item change. -# Notes: -# This can increase network traffic -# Default: False -ForceInventoryUpdate = False - # True = Load html's into cache only on first time html is requested. # False = Load all html's into cache on server startup. # Default: False diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/Config.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/Config.java index 0a550c3a1f..8945e35522 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/Config.java @@ -525,7 +525,6 @@ public class Config public static boolean CLEAR_DROPPED_ITEM_TABLE; public static boolean AUTODELETE_INVALID_QUEST_DATA; public static boolean MULTIPLE_ITEM_DROP; - public static boolean FORCE_INVENTORY_UPDATE; public static boolean LAZY_CACHE; public static boolean CHECK_HTML_ENCODING; public static boolean CACHE_CHAR_NAMES; @@ -1981,7 +1980,6 @@ public class Config CLEAR_DROPPED_ITEM_TABLE = generalConfig.getBoolean("ClearDroppedItemTable", false); AUTODELETE_INVALID_QUEST_DATA = generalConfig.getBoolean("AutoDeleteInvalidQuestData", false); MULTIPLE_ITEM_DROP = generalConfig.getBoolean("MultipleItemDrop", true); - FORCE_INVENTORY_UPDATE = generalConfig.getBoolean("ForceInventoryUpdate", false); LAZY_CACHE = generalConfig.getBoolean("LazyCache", true); CHECK_HTML_ENCODING = generalConfig.getBoolean("CheckHtmlEncoding", true); CACHE_CHAR_NAMES = generalConfig.getBoolean("CacheCharNames", true); diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java index 67662c8c71..1c97bee7e4 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java @@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Util; @@ -585,14 +584,14 @@ public class TradeList else { // Prepare inventory update packet - final InventoryUpdate ownerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); - final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate ownerIU = new InventoryUpdate(); + final InventoryUpdate partnerIU = new InventoryUpdate(); // Transfer items partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); - _owner.sendPacket(ownerIU != null ? ownerIU : new ItemList(_owner, false)); - _partner.sendPacket(partnerIU != null ? partnerIU : new ItemList(_partner, false)); + _owner.sendPacket(ownerIU); + _partner.sendPacket(partnerIU); // Update current load as well StatusUpdate playerSU = new StatusUpdate(_owner); diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java index 868594b64e..0941fbdd3f 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -2921,22 +2921,15 @@ public class Player extends Playable _inventory.addAdena(process, count, this, reference); // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) + if (count == getAdena()) { - if (count == getAdena()) - { - sendPacket(new ItemList(this, false)); - } - else - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addModifiedItem(_inventory.getAdenaInstance()); - sendPacket(iu); - } + sendPacket(new ItemList(this, false)); } else { - sendPacket(new ItemList(this, false)); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(_inventory.getAdenaInstance()); + sendPacket(iu); } } } @@ -2969,16 +2962,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(adenaItem); - sendPacket(iu); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(adenaItem); + sendPacket(iu); if (sendMessage) { @@ -3014,16 +3000,10 @@ public class Player extends Playable } _inventory.addAncientAdena(process, count, this, reference); - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_inventory.getAncientAdenaInstance()); - sendPacket(iu); - } - else - { - sendPacket(new ItemList(this, false)); - } + + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_inventory.getAncientAdenaInstance()); + sendPacket(iu); } /** @@ -3053,16 +3033,9 @@ public class Player extends Playable return false; } - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(ancientAdenaItem); - sendPacket(iu); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(ancientAdenaItem); + sendPacket(iu); if (sendMessage) { @@ -3124,16 +3097,9 @@ public class Player extends Playable final Item newitem = _inventory.addItem(process, item, this, reference); // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(newitem); - sendPacket(playerIU); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(newitem); + sendPacket(playerIU); // Update current load as well final StatusUpdate su = new StatusUpdate(this); @@ -3284,16 +3250,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(destoyedItem); - sendPacket(playerIU); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(destoyedItem); + sendPacket(playerIU); // Update current load as well final StatusUpdate su = new StatusUpdate(this); @@ -3397,16 +3356,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(item); - sendPacket(playerIU); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(item); + sendPacket(playerIU); // Update current load as well final StatusUpdate su = new StatusUpdate(this); @@ -3457,23 +3409,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } - sendPacket(playerIU); + playerIU.addModifiedItem(oldItem); } else { - sendPacket(new ItemList(this, false)); + playerIU.addRemovedItem(oldItem); } + sendPacket(playerIU); // Update current load as well StatusUpdate playerSU = new StatusUpdate(this); @@ -3484,23 +3429,16 @@ public class Player extends Playable if (target instanceof PlayerInventory) { final Player targetPlayer = ((PlayerInventory) target).getOwner(); - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate targetIU = new InventoryUpdate(); + if (newItem.getCount() > count) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (newItem.getCount() > count) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } - targetPlayer.sendPacket(playerIU); + targetIU.addModifiedItem(newItem); } else { - targetPlayer.sendPacket(new ItemList(targetPlayer, false)); + targetIU.addNewItem(newItem); } + targetPlayer.sendPacket(targetIU); // Update current load as well playerSU = new StatusUpdate(targetPlayer); @@ -3607,16 +3545,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(droppedItem); - sendPacket(playerIU); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(droppedItem); + sendPacket(playerIU); // Update current load as well final StatusUpdate su = new StatusUpdate(this); @@ -3686,16 +3617,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(invitem); - sendPacket(playerIU); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(invitem); + sendPacket(playerIU); // Update current load as well final StatusUpdate su = new StatusUpdate(this); @@ -5885,16 +5809,9 @@ public class Player extends Playable return; } - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addModifiedItem(arrows); - sendPacket(iu); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(arrows); + sendPacket(iu); } /** diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 37ca2020c8..81b3ca3acc 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -465,23 +465,16 @@ public class PlayerInventory extends Inventory if (actor != null) { // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > count)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > count)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addNewItem(item); - } - actor.sendPacket(playerIU); + playerIU.addModifiedItem(item); } else { - actor.sendPacket(new ItemList(actor, false)); + playerIU.addNewItem(item); } + actor.sendPacket(playerIU); // Update current load as well final StatusUpdate su = new StatusUpdate(actor); diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 46ec59db88..9bd3f65f31 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -31,7 +31,6 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Util; @@ -189,23 +188,16 @@ public class RequestDestroyItem implements IClientIncomingPacket return; } - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate iu = new InventoryUpdate(); + if (removedItem.getCount() == 0) { - final InventoryUpdate iu = new InventoryUpdate(); - if (removedItem.getCount() == 0) - { - iu.addRemovedItem(removedItem); - } - else - { - iu.addModifiedItem(removedItem); - } - player.sendPacket(iu); + iu.addRemovedItem(removedItem); } else { - player.sendPacket(new ItemList(player, true)); + iu.addModifiedItem(removedItem); } + player.sendPacket(iu); final StatusUpdate su = new StatusUpdate(player); su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad()); diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 647b16e4c2..ceca30a605 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -34,7 +34,6 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.EnchantResult; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -409,45 +408,37 @@ public class RequestEnchantItem implements IClientIncomingPacket final StatusUpdate su = new StatusUpdate(player); su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad()); player.sendPacket(su); - if (!Config.FORCE_INVENTORY_UPDATE) + if (scroll.getCount() == 0) { - if (scroll.getCount() == 0) - { - iu.addRemovedItem(scroll); - } - else - { - iu.addModifiedItem(scroll); - } - - if (item.getCount() == 0) - { - iu.addRemovedItem(item); - } - else - { - iu.addModifiedItem(item); - } - - if (support != null) - { - if (support.getCount() == 0) - { - iu.addRemovedItem(support); - } - else - { - iu.addModifiedItem(support); - } - } - - player.sendPacket(iu); + iu.addRemovedItem(scroll); } else { - player.sendPacket(new ItemList(player, true)); + iu.addModifiedItem(scroll); } + if (item.getCount() == 0) + { + iu.addRemovedItem(item); + } + else + { + iu.addModifiedItem(item); + } + + if (support != null) + { + if (support.getCount() == 0) + { + iu.addRemovedItem(support); + } + else + { + iu.addModifiedItem(support); + } + } + + player.sendPacket(iu); player.broadcastUserInfo(); player.setActiveEnchantItemId(Player.ID_NONE); } diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index c72cec4b78..c0820e5146 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.util.Util; @@ -165,7 +164,7 @@ public class RequestPackageSend implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder i : _items) { // Check validity of requested item @@ -184,16 +183,13 @@ public class RequestPackageSend implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } // Remove item objects from the world. @@ -204,7 +200,7 @@ public class RequestPackageSend implements IClientIncomingPacket warehouse.deleteMe(); // Send updated item list to the player - player.sendPacket(playerIU != null ? playerIU : new ItemList(player, false)); + player.sendPacket(playerIU); // Update current load status on player final StatusUpdate su = new StatusUpdate(player); diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 0fee21157b..e6ac890074 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.util.Util; @@ -170,7 +169,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder itemHolder : _items) { // Check validity of requested item @@ -193,28 +192,18 @@ public class SendWareHouseDepositList implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendPacket(playerIU); - } - else - { - player.sendPacket(new ItemList(player, false)); - } + player.sendPacket(playerIU); // Update current load status on player final StatusUpdate su = new StatusUpdate(player); diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 34c89bd165..92b1b8a70a 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.util.Util; @@ -165,7 +164,7 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder i : _items) { final Item oldItem = warehouse.getItemByObjectId(i.getId()); @@ -181,28 +180,18 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.getCount() > i.getCount()) { - if (newItem.getCount() > i.getCount()) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); + } + else + { + playerIU.addNewItem(newItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendPacket(playerIU); - } - else - { - player.sendPacket(new ItemList(player, false)); - } + player.sendPacket(playerIU); // Update current load status on player final StatusUpdate su = new StatusUpdate(player); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/General.ini b/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/General.ini index 4055971deb..1b228dd6b0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/General.ini +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/General.ini @@ -227,12 +227,6 @@ AutoDeleteInvalidQuestData = False # Default: True MultipleItemDrop = True -# Forces full item inventory packet to be sent for any item change. -# Notes: -# This can increase network traffic -# Default: False -ForceInventoryUpdate = False - # True = Load html's into cache only on first time html is requested. # False = Load all html's into cache on server startup. # Default: False diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/Config.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/Config.java index 1b4b622272..970a2e36e6 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/Config.java @@ -533,7 +533,6 @@ public class Config public static boolean CLEAR_DROPPED_ITEM_TABLE; public static boolean AUTODELETE_INVALID_QUEST_DATA; public static boolean MULTIPLE_ITEM_DROP; - public static boolean FORCE_INVENTORY_UPDATE; public static boolean LAZY_CACHE; public static boolean CHECK_HTML_ENCODING; public static boolean CACHE_CHAR_NAMES; @@ -2046,7 +2045,6 @@ public class Config CLEAR_DROPPED_ITEM_TABLE = generalConfig.getBoolean("ClearDroppedItemTable", false); AUTODELETE_INVALID_QUEST_DATA = generalConfig.getBoolean("AutoDeleteInvalidQuestData", false); MULTIPLE_ITEM_DROP = generalConfig.getBoolean("MultipleItemDrop", true); - FORCE_INVENTORY_UPDATE = generalConfig.getBoolean("ForceInventoryUpdate", false); LAZY_CACHE = generalConfig.getBoolean("LazyCache", true); CHECK_HTML_ENCODING = generalConfig.getBoolean("CheckHtmlEncoding", true); CACHE_CHAR_NAMES = generalConfig.getBoolean("CacheCharNames", true); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/CombatFlag.java index 9e175b32c9..0ec38dce85 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -16,13 +16,11 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class CombatFlag @@ -85,16 +83,10 @@ public class CombatFlag _player.sendPacket(sm); // Refresh inventory - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_item); - _player.sendPacket(iu); - } - else - { - _player.sendPacket(new ItemList(_player, false)); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_item); + _player.sendPacket(iu); + // Refresh player stats _player.broadcastUserInfo(); _player.setCombatFlagEquipped(true); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/TerritoryWard.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/TerritoryWard.java index 1839b6a1bf..1bf734fc1f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/TerritoryWard.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/TerritoryWard.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -24,7 +23,6 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class TerritoryWard @@ -153,16 +151,9 @@ public class TerritoryWard _player.sendPacket(sm); // Refresh inventory - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_item); - _player.sendPacket(iu); - } - else - { - _player.sendPacket(new ItemList(_player, false)); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_item); + _player.sendPacket(iu); // Refresh player stats _player.broadcastUserInfo(); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/TradeList.java index e0da8179f8..06cadfdeb9 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/TradeList.java @@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Util; @@ -585,14 +584,14 @@ public class TradeList else { // Prepare inventory update packet - final InventoryUpdate ownerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); - final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate ownerIU = new InventoryUpdate(); + final InventoryUpdate partnerIU = new InventoryUpdate(); // Transfer items partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); - _owner.sendPacket(ownerIU != null ? ownerIU : new ItemList(_owner, false)); - _partner.sendPacket(partnerIU != null ? partnerIU : new ItemList(_partner, false)); + _owner.sendPacket(ownerIU); + _partner.sendPacket(partnerIU); // Update current load as well StatusUpdate playerSU = new StatusUpdate(_owner); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java index 8f018947c7..3dbfbfca0c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -3109,22 +3109,15 @@ public class Player extends Playable _inventory.addAdena(process, count, this, reference); // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) + if (count == getAdena()) { - if (count == getAdena()) - { - sendPacket(new ItemList(this, false)); - } - else - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addModifiedItem(_inventory.getAdenaInstance()); - sendPacket(iu); - } + sendPacket(new ItemList(this, false)); } else { - sendPacket(new ItemList(this, false)); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(_inventory.getAdenaInstance()); + sendPacket(iu); } } } @@ -3157,16 +3150,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(adenaItem); - sendPacket(iu); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(adenaItem); + sendPacket(iu); if (sendMessage) { @@ -3202,16 +3188,10 @@ public class Player extends Playable } _inventory.addAncientAdena(process, count, this, reference); - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_inventory.getAncientAdenaInstance()); - sendPacket(iu); - } - else - { - sendPacket(new ItemList(this, false)); - } + + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_inventory.getAncientAdenaInstance()); + sendPacket(iu); } /** @@ -3241,16 +3221,9 @@ public class Player extends Playable return false; } - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(ancientAdenaItem); - sendPacket(iu); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(ancientAdenaItem); + sendPacket(iu); if (sendMessage) { @@ -3312,16 +3285,9 @@ public class Player extends Playable final Item newitem = _inventory.addItem(process, item, this, reference); // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(newitem); - sendPacket(playerIU); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(newitem); + sendPacket(playerIU); // Update current load as well final StatusUpdate su = new StatusUpdate(this); @@ -3499,16 +3465,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(destoyedItem); - sendPacket(playerIU); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(destoyedItem); + sendPacket(playerIU); // Update current load as well final StatusUpdate su = new StatusUpdate(this); @@ -3612,16 +3571,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(item); - sendPacket(playerIU); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(item); + sendPacket(playerIU); // Update current load as well final StatusUpdate su = new StatusUpdate(this); @@ -3672,23 +3624,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } - sendPacket(playerIU); + playerIU.addModifiedItem(oldItem); } else { - sendPacket(new ItemList(this, false)); + playerIU.addRemovedItem(oldItem); } + sendPacket(playerIU); // Update current load as well StatusUpdate playerSU = new StatusUpdate(this); @@ -3699,23 +3644,16 @@ public class Player extends Playable if (target instanceof PlayerInventory) { final Player targetPlayer = ((PlayerInventory) target).getOwner(); - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate targetIU = new InventoryUpdate(); + if (newItem.getCount() > count) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (newItem.getCount() > count) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } - targetPlayer.sendPacket(playerIU); + targetIU.addModifiedItem(newItem); } else { - targetPlayer.sendPacket(new ItemList(targetPlayer, false)); + targetIU.addNewItem(newItem); } + targetPlayer.sendPacket(targetIU); // Update current load as well playerSU = new StatusUpdate(targetPlayer); @@ -3822,16 +3760,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(droppedItem); - sendPacket(playerIU); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(droppedItem); + sendPacket(playerIU); // Update current load as well final StatusUpdate su = new StatusUpdate(this); @@ -3901,16 +3832,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(invitem); - sendPacket(playerIU); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(invitem); + sendPacket(playerIU); // Update current load as well final StatusUpdate su = new StatusUpdate(this); @@ -6235,16 +6159,9 @@ public class Player extends Playable return; } - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addModifiedItem(arrows); - sendPacket(iu); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(arrows); + sendPacket(iu); } /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 34e62c6d7d..4374902e13 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -482,23 +482,16 @@ public class PlayerInventory extends Inventory if (actor != null) { // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > count)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > count)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addNewItem(item); - } - actor.sendPacket(playerIU); + playerIU.addModifiedItem(item); } else { - actor.sendPacket(new ItemList(actor, false)); + playerIU.addNewItem(item); } + actor.sendPacket(playerIU); // Update current load as well final StatusUpdate su = new StatusUpdate(actor); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 41e030623b..b343d24791 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -163,7 +163,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -178,17 +178,15 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); } + else + { + playerIU.addNewItem(newItem); + } + final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); sm.addItemName(item.getId()); sm.addLong(count); @@ -198,10 +196,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket msg.removeAttachments(); // Send updated item list to the player - if (playerIU != null) - { - player.sendPacket(playerIU); - } + player.sendPacket(playerIU); + // Send full list to avoid duplicates. player.sendPacket(new ItemList(player, false)); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index e459d62811..0bafe35e50 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -31,7 +31,6 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Util; @@ -189,23 +188,16 @@ public class RequestDestroyItem implements IClientIncomingPacket return; } - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate iu = new InventoryUpdate(); + if (removedItem.getCount() == 0) { - final InventoryUpdate iu = new InventoryUpdate(); - if (removedItem.getCount() == 0) - { - iu.addRemovedItem(removedItem); - } - else - { - iu.addModifiedItem(removedItem); - } - player.sendPacket(iu); + iu.addRemovedItem(removedItem); } else { - player.sendPacket(new ItemList(player, true)); + iu.addModifiedItem(removedItem); } + player.sendPacket(iu); final StatusUpdate su = new StatusUpdate(player); su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad()); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 6750f14457..13cdb61e71 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -34,7 +34,6 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.EnchantResult; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -409,45 +408,37 @@ public class RequestEnchantItem implements IClientIncomingPacket final StatusUpdate su = new StatusUpdate(player); su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad()); player.sendPacket(su); - if (!Config.FORCE_INVENTORY_UPDATE) + if (scroll.getCount() == 0) { - if (scroll.getCount() == 0) - { - iu.addRemovedItem(scroll); - } - else - { - iu.addModifiedItem(scroll); - } - - if (item.getCount() == 0) - { - iu.addRemovedItem(item); - } - else - { - iu.addModifiedItem(item); - } - - if (support != null) - { - if (support.getCount() == 0) - { - iu.addRemovedItem(support); - } - else - { - iu.addModifiedItem(support); - } - } - - player.sendPacket(iu); + iu.addRemovedItem(scroll); } else { - player.sendPacket(new ItemList(player, true)); + iu.addModifiedItem(scroll); } + if (item.getCount() == 0) + { + iu.addRemovedItem(item); + } + else + { + iu.addModifiedItem(item); + } + + if (support != null) + { + if (support.getCount() == 0) + { + iu.addRemovedItem(support); + } + else + { + iu.addModifiedItem(support); + } + } + + player.sendPacket(iu); player.broadcastUserInfo(); player.setActiveEnchantItemId(Player.ID_NONE); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 7720aee22e..4c84ba70f7 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.util.Util; @@ -165,7 +164,7 @@ public class RequestPackageSend implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder i : _items) { // Check validity of requested item @@ -184,16 +183,13 @@ public class RequestPackageSend implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } // Remove item objects from the world. @@ -204,7 +200,7 @@ public class RequestPackageSend implements IClientIncomingPacket warehouse.deleteMe(); // Send updated item list to the player - player.sendPacket(playerIU != null ? playerIU : new ItemList(player, false)); + player.sendPacket(playerIU); // Update current load status on player final StatusUpdate su = new StatusUpdate(player); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index cfe31f87f0..8229c92ff6 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -186,7 +186,7 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -207,16 +207,13 @@ public class RequestPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); + } + else + { + playerIU.addNewItem(newItem); } final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); @@ -226,10 +223,8 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Send updated item list to the player - if (playerIU != null) - { - player.sendPacket(playerIU); - } + player.sendPacket(playerIU); + // Send full list to avoid duplicates. player.sendPacket(new ItemList(player, false)); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 330bcfd5a5..fe0c714b0f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -37,7 +37,6 @@ import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExNoticePostSent; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -307,7 +306,7 @@ public class RequestSendPost implements IClientIncomingPacket final String receiver = recv.toString(); // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (AttachmentItem i : _items) { // Check validity of requested item @@ -325,28 +324,19 @@ public class RequestSendPost implements IClientIncomingPacket continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); - if (playerIU != null) + + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendPacket(playerIU); - } - else - { - player.sendPacket(new ItemList(player, false)); - } + player.sendPacket(playerIU); // Update current load status on player final StatusUpdate su = new StatusUpdate(player); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 67eba69446..44a4e6fbcd 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.util.Util; @@ -170,7 +169,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder itemHolder : _items) { // Check validity of requested item @@ -193,28 +192,18 @@ public class SendWareHouseDepositList implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendPacket(playerIU); - } - else - { - player.sendPacket(new ItemList(player, false)); - } + player.sendPacket(playerIU); // Update current load status on player final StatusUpdate su = new StatusUpdate(player); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index da70480682..060f5816b3 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.util.Util; @@ -165,7 +164,7 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder i : _items) { final Item oldItem = warehouse.getItemByObjectId(i.getId()); @@ -181,28 +180,18 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.getCount() > i.getCount()) { - if (newItem.getCount() > i.getCount()) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); + } + else + { + playerIU.addNewItem(newItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendPacket(playerIU); - } - else - { - player.sendPacket(new ItemList(player, false)); - } + player.sendPacket(playerIU); // Update current load status on player final StatusUpdate su = new StatusUpdate(player); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/General.ini b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/General.ini index 4055971deb..1b228dd6b0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/General.ini +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/General.ini @@ -227,12 +227,6 @@ AutoDeleteInvalidQuestData = False # Default: True MultipleItemDrop = True -# Forces full item inventory packet to be sent for any item change. -# Notes: -# This can increase network traffic -# Default: False -ForceInventoryUpdate = False - # True = Load html's into cache only on first time html is requested. # False = Load all html's into cache on server startup. # Default: False diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/Config.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/Config.java index 5cc6666d45..45f2611890 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/Config.java @@ -538,7 +538,6 @@ public class Config public static boolean CLEAR_DROPPED_ITEM_TABLE; public static boolean AUTODELETE_INVALID_QUEST_DATA; public static boolean MULTIPLE_ITEM_DROP; - public static boolean FORCE_INVENTORY_UPDATE; public static boolean LAZY_CACHE; public static boolean CHECK_HTML_ENCODING; public static boolean CACHE_CHAR_NAMES; @@ -2051,7 +2050,6 @@ public class Config CLEAR_DROPPED_ITEM_TABLE = generalConfig.getBoolean("ClearDroppedItemTable", false); AUTODELETE_INVALID_QUEST_DATA = generalConfig.getBoolean("AutoDeleteInvalidQuestData", false); MULTIPLE_ITEM_DROP = generalConfig.getBoolean("MultipleItemDrop", true); - FORCE_INVENTORY_UPDATE = generalConfig.getBoolean("ForceInventoryUpdate", false); LAZY_CACHE = generalConfig.getBoolean("LazyCache", true); CHECK_HTML_ENCODING = generalConfig.getBoolean("CheckHtmlEncoding", true); CACHE_CHAR_NAMES = generalConfig.getBoolean("CacheCharNames", true); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/CombatFlag.java index 9e175b32c9..0ec38dce85 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -16,13 +16,11 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class CombatFlag @@ -85,16 +83,10 @@ public class CombatFlag _player.sendPacket(sm); // Refresh inventory - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_item); - _player.sendPacket(iu); - } - else - { - _player.sendPacket(new ItemList(_player, false)); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_item); + _player.sendPacket(iu); + // Refresh player stats _player.broadcastUserInfo(); _player.setCombatFlagEquipped(true); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/TerritoryWard.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/TerritoryWard.java index 1839b6a1bf..1bf734fc1f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/TerritoryWard.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/TerritoryWard.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -24,7 +23,6 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class TerritoryWard @@ -153,16 +151,9 @@ public class TerritoryWard _player.sendPacket(sm); // Refresh inventory - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_item); - _player.sendPacket(iu); - } - else - { - _player.sendPacket(new ItemList(_player, false)); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_item); + _player.sendPacket(iu); // Refresh player stats _player.broadcastUserInfo(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/TradeList.java index e0da8179f8..06cadfdeb9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/TradeList.java @@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Util; @@ -585,14 +584,14 @@ public class TradeList else { // Prepare inventory update packet - final InventoryUpdate ownerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); - final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate ownerIU = new InventoryUpdate(); + final InventoryUpdate partnerIU = new InventoryUpdate(); // Transfer items partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); - _owner.sendPacket(ownerIU != null ? ownerIU : new ItemList(_owner, false)); - _partner.sendPacket(partnerIU != null ? partnerIU : new ItemList(_partner, false)); + _owner.sendPacket(ownerIU); + _partner.sendPacket(partnerIU); // Update current load as well StatusUpdate playerSU = new StatusUpdate(_owner); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java index 11a08ff75a..7f9cd6ad2d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -3020,22 +3020,15 @@ public class Player extends Playable _inventory.addAdena(process, count, this, reference); // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) + if (count == getAdena()) { - if (count == getAdena()) - { - sendPacket(new ItemList(this, false)); - } - else - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addModifiedItem(_inventory.getAdenaInstance()); - sendPacket(iu); - } + sendPacket(new ItemList(this, false)); } else { - sendPacket(new ItemList(this, false)); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(_inventory.getAdenaInstance()); + sendPacket(iu); } } } @@ -3068,16 +3061,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(adenaItem); - sendPacket(iu); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(adenaItem); + sendPacket(iu); if (sendMessage) { @@ -3113,16 +3099,10 @@ public class Player extends Playable } _inventory.addAncientAdena(process, count, this, reference); - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_inventory.getAncientAdenaInstance()); - sendPacket(iu); - } - else - { - sendPacket(new ItemList(this, false)); - } + + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_inventory.getAncientAdenaInstance()); + sendPacket(iu); } /** @@ -3152,16 +3132,9 @@ public class Player extends Playable return false; } - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(ancientAdenaItem); - sendPacket(iu); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(ancientAdenaItem); + sendPacket(iu); if (sendMessage) { @@ -3223,16 +3196,9 @@ public class Player extends Playable final Item newitem = _inventory.addItem(process, item, this, reference); // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(newitem); - sendPacket(playerIU); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(newitem); + sendPacket(playerIU); // Update current load as well final StatusUpdate su = new StatusUpdate(this); @@ -3410,16 +3376,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(destoyedItem); - sendPacket(playerIU); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(destoyedItem); + sendPacket(playerIU); // Update current load as well final StatusUpdate su = new StatusUpdate(this); @@ -3523,16 +3482,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(item); - sendPacket(playerIU); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(item); + sendPacket(playerIU); // Update current load as well final StatusUpdate su = new StatusUpdate(this); @@ -3583,23 +3535,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } - sendPacket(playerIU); + playerIU.addModifiedItem(oldItem); } else { - sendPacket(new ItemList(this, false)); + playerIU.addRemovedItem(oldItem); } + sendPacket(playerIU); // Update current load as well StatusUpdate playerSU = new StatusUpdate(this); @@ -3610,23 +3555,16 @@ public class Player extends Playable if (target instanceof PlayerInventory) { final Player targetPlayer = ((PlayerInventory) target).getOwner(); - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate targetIU = new InventoryUpdate(); + if (newItem.getCount() > count) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (newItem.getCount() > count) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } - targetPlayer.sendPacket(playerIU); + targetIU.addModifiedItem(newItem); } else { - targetPlayer.sendPacket(new ItemList(targetPlayer, false)); + targetIU.addNewItem(newItem); } + targetPlayer.sendPacket(targetIU); // Update current load as well playerSU = new StatusUpdate(targetPlayer); @@ -3733,16 +3671,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(droppedItem); - sendPacket(playerIU); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(droppedItem); + sendPacket(playerIU); // Update current load as well final StatusUpdate su = new StatusUpdate(this); @@ -3812,16 +3743,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(invitem); - sendPacket(playerIU); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(invitem); + sendPacket(playerIU); // Update current load as well final StatusUpdate su = new StatusUpdate(this); @@ -6132,16 +6056,9 @@ public class Player extends Playable return; } - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addModifiedItem(arrows); - sendPacket(iu); - } - else - { - sendPacket(new ItemList(this, false)); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(arrows); + sendPacket(iu); } /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 34e62c6d7d..4374902e13 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -482,23 +482,16 @@ public class PlayerInventory extends Inventory if (actor != null) { // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > count)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > count)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addNewItem(item); - } - actor.sendPacket(playerIU); + playerIU.addModifiedItem(item); } else { - actor.sendPacket(new ItemList(actor, false)); + playerIU.addNewItem(item); } + actor.sendPacket(playerIU); // Update current load as well final StatusUpdate su = new StatusUpdate(actor); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 41e030623b..b343d24791 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -163,7 +163,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -178,17 +178,15 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); } + else + { + playerIU.addNewItem(newItem); + } + final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); sm.addItemName(item.getId()); sm.addLong(count); @@ -198,10 +196,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket msg.removeAttachments(); // Send updated item list to the player - if (playerIU != null) - { - player.sendPacket(playerIU); - } + player.sendPacket(playerIU); + // Send full list to avoid duplicates. player.sendPacket(new ItemList(player, false)); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index e459d62811..0bafe35e50 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -31,7 +31,6 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Util; @@ -189,23 +188,16 @@ public class RequestDestroyItem implements IClientIncomingPacket return; } - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate iu = new InventoryUpdate(); + if (removedItem.getCount() == 0) { - final InventoryUpdate iu = new InventoryUpdate(); - if (removedItem.getCount() == 0) - { - iu.addRemovedItem(removedItem); - } - else - { - iu.addModifiedItem(removedItem); - } - player.sendPacket(iu); + iu.addRemovedItem(removedItem); } else { - player.sendPacket(new ItemList(player, true)); + iu.addModifiedItem(removedItem); } + player.sendPacket(iu); final StatusUpdate su = new StatusUpdate(player); su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 6750f14457..13cdb61e71 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -34,7 +34,6 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.EnchantResult; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -409,45 +408,37 @@ public class RequestEnchantItem implements IClientIncomingPacket final StatusUpdate su = new StatusUpdate(player); su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad()); player.sendPacket(su); - if (!Config.FORCE_INVENTORY_UPDATE) + if (scroll.getCount() == 0) { - if (scroll.getCount() == 0) - { - iu.addRemovedItem(scroll); - } - else - { - iu.addModifiedItem(scroll); - } - - if (item.getCount() == 0) - { - iu.addRemovedItem(item); - } - else - { - iu.addModifiedItem(item); - } - - if (support != null) - { - if (support.getCount() == 0) - { - iu.addRemovedItem(support); - } - else - { - iu.addModifiedItem(support); - } - } - - player.sendPacket(iu); + iu.addRemovedItem(scroll); } else { - player.sendPacket(new ItemList(player, true)); + iu.addModifiedItem(scroll); } + if (item.getCount() == 0) + { + iu.addRemovedItem(item); + } + else + { + iu.addModifiedItem(item); + } + + if (support != null) + { + if (support.getCount() == 0) + { + iu.addRemovedItem(support); + } + else + { + iu.addModifiedItem(support); + } + } + + player.sendPacket(iu); player.broadcastUserInfo(); player.setActiveEnchantItemId(Player.ID_NONE); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 7720aee22e..4c84ba70f7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.util.Util; @@ -165,7 +164,7 @@ public class RequestPackageSend implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder i : _items) { // Check validity of requested item @@ -184,16 +183,13 @@ public class RequestPackageSend implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } // Remove item objects from the world. @@ -204,7 +200,7 @@ public class RequestPackageSend implements IClientIncomingPacket warehouse.deleteMe(); // Send updated item list to the player - player.sendPacket(playerIU != null ? playerIU : new ItemList(player, false)); + player.sendPacket(playerIU); // Update current load status on player final StatusUpdate su = new StatusUpdate(player); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index cfe31f87f0..8229c92ff6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -186,7 +186,7 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -207,16 +207,13 @@ public class RequestPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); + } + else + { + playerIU.addNewItem(newItem); } final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); @@ -226,10 +223,8 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Send updated item list to the player - if (playerIU != null) - { - player.sendPacket(playerIU); - } + player.sendPacket(playerIU); + // Send full list to avoid duplicates. player.sendPacket(new ItemList(player, false)); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 330bcfd5a5..fe0c714b0f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -37,7 +37,6 @@ import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExNoticePostSent; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -307,7 +306,7 @@ public class RequestSendPost implements IClientIncomingPacket final String receiver = recv.toString(); // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (AttachmentItem i : _items) { // Check validity of requested item @@ -325,28 +324,19 @@ public class RequestSendPost implements IClientIncomingPacket continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); - if (playerIU != null) + + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendPacket(playerIU); - } - else - { - player.sendPacket(new ItemList(player, false)); - } + player.sendPacket(playerIU); // Update current load status on player final StatusUpdate su = new StatusUpdate(player); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 67eba69446..44a4e6fbcd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.util.Util; @@ -170,7 +169,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder itemHolder : _items) { // Check validity of requested item @@ -193,28 +192,18 @@ public class SendWareHouseDepositList implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendPacket(playerIU); - } - else - { - player.sendPacket(new ItemList(player, false)); - } + player.sendPacket(playerIU); // Update current load status on player final StatusUpdate su = new StatusUpdate(player); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index da70480682..060f5816b3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; -import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import org.l2jmobius.gameserver.util.Util; @@ -165,7 +164,7 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder i : _items) { final Item oldItem = warehouse.getItemByObjectId(i.getId()); @@ -181,28 +180,18 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.getCount() > i.getCount()) { - if (newItem.getCount() > i.getCount()) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); + } + else + { + playerIU.addNewItem(newItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendPacket(playerIU); - } - else - { - player.sendPacket(new ItemList(player, false)); - } + player.sendPacket(playerIU); // Update current load status on player final StatusUpdate su = new StatusUpdate(player); diff --git a/L2J_Mobius_Classic_1.0/dist/game/config/General.ini b/L2J_Mobius_Classic_1.0/dist/game/config/General.ini index a2584ee548..58e46ecfa2 100644 --- a/L2J_Mobius_Classic_1.0/dist/game/config/General.ini +++ b/L2J_Mobius_Classic_1.0/dist/game/config/General.ini @@ -238,12 +238,6 @@ StoryQuestRewardBuff = True # Default: True MultipleItemDrop = True -# Forces full item inventory packet to be sent for any item change. -# Notes: -# This can increase network traffic -# Default: False -ForceInventoryUpdate = False - # True = Load html's into cache only on first time html is requested. # False = Load all html's into cache on server startup. # Default: False diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/Config.java index c4574fe34c..2b385cd22c 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/Config.java @@ -488,7 +488,6 @@ public class Config public static boolean AUTODELETE_INVALID_QUEST_DATA; public static boolean ENABLE_STORY_QUEST_BUFF_REWARD; public static boolean MULTIPLE_ITEM_DROP; - public static boolean FORCE_INVENTORY_UPDATE; public static boolean LAZY_CACHE; public static boolean CHECK_HTML_ENCODING; public static boolean CACHE_CHAR_NAMES; @@ -1928,7 +1927,6 @@ public class Config AUTODELETE_INVALID_QUEST_DATA = generalConfig.getBoolean("AutoDeleteInvalidQuestData", false); ENABLE_STORY_QUEST_BUFF_REWARD = generalConfig.getBoolean("StoryQuestRewardBuff", true); MULTIPLE_ITEM_DROP = generalConfig.getBoolean("MultipleItemDrop", true); - FORCE_INVENTORY_UPDATE = generalConfig.getBoolean("ForceInventoryUpdate", false); LAZY_CACHE = generalConfig.getBoolean("LazyCache", true); CHECK_HTML_ENCODING = generalConfig.getBoolean("CheckHtmlEncoding", true); CACHE_CHAR_NAMES = generalConfig.getBoolean("CacheCharNames", true); diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/CombatFlag.java index 7385a9fc13..5cd007f840 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -84,16 +83,10 @@ public class CombatFlag _player.sendPacket(sm); // Refresh inventory - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_item); - _player.sendInventoryUpdate(iu); - } - else - { - _player.sendItemList(false); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_item); + _player.sendInventoryUpdate(iu); + // Refresh player stats _player.broadcastUserInfo(); _player.setCombatFlagEquipped(true); diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/TradeList.java index b5e239891a..dd67b4b502 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/TradeList.java @@ -589,31 +589,17 @@ public class TradeList else { // Prepare inventory update packet - final InventoryUpdate ownerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); - final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate ownerIU = new InventoryUpdate(); + final InventoryUpdate partnerIU = new InventoryUpdate(); // Transfer items partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); // Send inventory update packet - if (ownerIU != null) - { - _owner.sendInventoryUpdate(ownerIU); - } - else - { - _owner.sendItemList(false); - } + _owner.sendInventoryUpdate(ownerIU); + _partner.sendInventoryUpdate(partnerIU); - if (partnerIU != null) - { - _partner.sendInventoryUpdate(partnerIU); - } - else - { - _partner.sendItemList(false); - } success = true; } diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Player.java index 0fc82feac9..0c3484b4c8 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -3052,22 +3052,15 @@ public class Player extends Playable _inventory.addAdena(process, count, this, reference); // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) + if (count == getAdena()) { - if (count == getAdena()) - { - sendItemList(false); - } - else - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addModifiedItem(_inventory.getAdenaInstance()); - sendInventoryUpdate(iu); - } + sendItemList(false); } else { - sendItemList(false); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(_inventory.getAdenaInstance()); + sendInventoryUpdate(iu); } } } @@ -3100,16 +3093,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(adenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(false); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(adenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3150,16 +3136,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(beautyTickets); - sendInventoryUpdate(iu); - } - else - { - sendItemList(false); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(beautyTickets); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3202,16 +3181,10 @@ public class Player extends Playable if (count > 0) { _inventory.addAncientAdena(process, count, this, reference); - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_inventory.getAncientAdenaInstance()); - sendInventoryUpdate(iu); - } - else - { - sendItemList(false); - } + + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_inventory.getAncientAdenaInstance()); + sendInventoryUpdate(iu); } } @@ -3242,16 +3215,9 @@ public class Player extends Playable return false; } - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(ancientAdenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(false); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(ancientAdenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3458,23 +3424,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) - { - playerIU.addModifiedItem(destoyedItem); - } - else - { - playerIU.addRemovedItem(destoyedItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(destoyedItem); } else { - sendItemList(false); + playerIU.addRemovedItem(destoyedItem); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3574,23 +3533,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > 0)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addRemovedItem(item); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - sendItemList(false); + playerIU.addRemovedItem(item); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3636,45 +3588,31 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(oldItem); } else { - sendItemList(false); + playerIU.addRemovedItem(oldItem); } + sendInventoryUpdate(playerIU); // Send target update packet if (target instanceof PlayerInventory) { final Player targetPlayer = ((PlayerInventory) target).getOwner(); - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate targetIU = new InventoryUpdate(); + if (newItem.getCount() > count) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (newItem.getCount() > count) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } - targetPlayer.sendPacket(playerIU); + targetIU.addModifiedItem(newItem); } else { - targetPlayer.sendItemList(false); + targetIU.addNewItem(newItem); } + targetPlayer.sendPacket(targetIU); } else if (target instanceof PetInventory) { @@ -3777,16 +3715,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(droppedItem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(false); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(droppedItem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3851,16 +3782,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(invitem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(false); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(invitem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 3c666f7e20..acadfda622 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -437,16 +437,9 @@ public class PlayerInventory extends Inventory if (actor != null) { // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(addedItem); - actor.sendInventoryUpdate(playerIU); - } - else - { - actor.sendItemList(false); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(addedItem); + actor.sendInventoryUpdate(playerIU); // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getTemplate()); @@ -511,23 +504,16 @@ public class PlayerInventory extends Inventory // Send inventory update packet if (update) { - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > count)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > count)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addNewItem(item); - } - actor.sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - actor.sendItemList(false); + playerIU.addNewItem(item); } + actor.sendInventoryUpdate(playerIU); } // Notify to scripts @@ -1171,14 +1157,7 @@ public class PlayerInventory extends Inventory } finally { - if (Config.FORCE_INVENTORY_UPDATE) - { - _owner.sendItemList(false); - } - else - { - _owner.sendInventoryUpdate(iu); - } + _owner.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 3954ae70e6..8112d3b2b0 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -161,7 +161,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -176,17 +176,15 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); } + else + { + playerIU.addNewItem(newItem); + } + final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); sm.addItemName(item.getId()); sm.addLong(count); @@ -196,10 +194,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket msg.removeAttachments(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(false); diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 717ac43807..0cb418fbf3 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -207,22 +207,15 @@ public class RequestDestroyItem implements IClientIncomingPacket return; } - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate iu = new InventoryUpdate(); + if (removedItem.getCount() == 0) { - final InventoryUpdate iu = new InventoryUpdate(); - if (removedItem.getCount() == 0) - { - iu.addRemovedItem(removedItem); - } - else - { - iu.addModifiedItem(removedItem); - } - player.sendInventoryUpdate(iu); + iu.addRemovedItem(removedItem); } else { - player.sendItemList(true); + iu.addModifiedItem(removedItem); } + player.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 245d953a0c..4634c1155e 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -401,7 +401,7 @@ public class RequestEnchantItem implements IClientIncomingPacket player.sendPacket(sm); } - if (!Config.FORCE_INVENTORY_UPDATE && (crystals != null)) + if (crystals != null) { iu.addItem(crystals); } diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 7570e3e5e2..6b247a4044 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -163,7 +163,7 @@ public class RequestPackageSend implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder i : _items) { // Check validity of requested item @@ -182,16 +182,13 @@ public class RequestPackageSend implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } // Remove item objects from the world. @@ -202,13 +199,6 @@ public class RequestPackageSend implements IClientIncomingPacket warehouse.deleteMe(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(false); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index bd00745002..77341ce68d 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -184,7 +184,7 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -205,16 +205,13 @@ public class RequestPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); + } + else + { + playerIU.addNewItem(newItem); } final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); @@ -224,10 +221,8 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(false); diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 5014c0b7d0..eb47cc8375 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -310,7 +310,7 @@ public class RequestSendPost implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (AttachmentItem i : _items) { // Check validity of requested item @@ -328,28 +328,19 @@ public class RequestSendPost implements IClientIncomingPacket continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); - if (playerIU != null) + + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(false); - } + player.sendInventoryUpdate(playerIU); return true; } diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index b332fd9707..8e354c0c64 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -168,7 +168,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder itemHolder : _items) { // Check validity of requested item @@ -191,27 +191,17 @@ public class SendWareHouseDepositList implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(false); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/config/General.ini b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/config/General.ini index bb5e02c907..4a303da2fc 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/config/General.ini +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/config/General.ini @@ -238,12 +238,6 @@ StoryQuestRewardBuff = True # Default: True MultipleItemDrop = True -# Forces full item inventory packet to be sent for any item change. -# Notes: -# This can increase network traffic -# Default: False -ForceInventoryUpdate = False - # True = Load html's into cache only on first time html is requested. # False = Load all html's into cache on server startup. # Default: False diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/Config.java index 3dcfc5892e..27aa3bcd0e 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/Config.java @@ -498,7 +498,6 @@ public class Config public static boolean AUTODELETE_INVALID_QUEST_DATA; public static boolean ENABLE_STORY_QUEST_BUFF_REWARD; public static boolean MULTIPLE_ITEM_DROP; - public static boolean FORCE_INVENTORY_UPDATE; public static boolean LAZY_CACHE; public static boolean CHECK_HTML_ENCODING; public static boolean CACHE_CHAR_NAMES; @@ -1957,7 +1956,6 @@ public class Config AUTODELETE_INVALID_QUEST_DATA = generalConfig.getBoolean("AutoDeleteInvalidQuestData", false); ENABLE_STORY_QUEST_BUFF_REWARD = generalConfig.getBoolean("StoryQuestRewardBuff", true); MULTIPLE_ITEM_DROP = generalConfig.getBoolean("MultipleItemDrop", true); - FORCE_INVENTORY_UPDATE = generalConfig.getBoolean("ForceInventoryUpdate", false); LAZY_CACHE = generalConfig.getBoolean("LazyCache", true); CHECK_HTML_ENCODING = generalConfig.getBoolean("CheckHtmlEncoding", true); CACHE_CHAR_NAMES = generalConfig.getBoolean("CacheCharNames", true); diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/CombatFlag.java index 7385a9fc13..5cd007f840 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -84,16 +83,10 @@ public class CombatFlag _player.sendPacket(sm); // Refresh inventory - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_item); - _player.sendInventoryUpdate(iu); - } - else - { - _player.sendItemList(false); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_item); + _player.sendInventoryUpdate(iu); + // Refresh player stats _player.broadcastUserInfo(); _player.setCombatFlagEquipped(true); diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/TradeList.java index b5e239891a..dd67b4b502 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/TradeList.java @@ -589,31 +589,17 @@ public class TradeList else { // Prepare inventory update packet - final InventoryUpdate ownerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); - final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate ownerIU = new InventoryUpdate(); + final InventoryUpdate partnerIU = new InventoryUpdate(); // Transfer items partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); // Send inventory update packet - if (ownerIU != null) - { - _owner.sendInventoryUpdate(ownerIU); - } - else - { - _owner.sendItemList(false); - } + _owner.sendInventoryUpdate(ownerIU); + _partner.sendInventoryUpdate(partnerIU); - if (partnerIU != null) - { - _partner.sendInventoryUpdate(partnerIU); - } - else - { - _partner.sendItemList(false); - } success = true; } diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Player.java index 9a33716f0b..a8d73969f7 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -3061,22 +3061,15 @@ public class Player extends Playable _inventory.addAdena(process, count, this, reference); // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) + if (count == getAdena()) { - if (count == getAdena()) - { - sendItemList(false); - } - else - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addModifiedItem(_inventory.getAdenaInstance()); - sendInventoryUpdate(iu); - } + sendItemList(false); } else { - sendItemList(false); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(_inventory.getAdenaInstance()); + sendInventoryUpdate(iu); } } } @@ -3109,16 +3102,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(adenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(false); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(adenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3159,16 +3145,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(beautyTickets); - sendInventoryUpdate(iu); - } - else - { - sendItemList(false); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(beautyTickets); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3211,16 +3190,10 @@ public class Player extends Playable if (count > 0) { _inventory.addAncientAdena(process, count, this, reference); - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_inventory.getAncientAdenaInstance()); - sendInventoryUpdate(iu); - } - else - { - sendItemList(false); - } + + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_inventory.getAncientAdenaInstance()); + sendInventoryUpdate(iu); } } @@ -3251,16 +3224,9 @@ public class Player extends Playable return false; } - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(ancientAdenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(false); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(ancientAdenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3467,23 +3433,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) - { - playerIU.addModifiedItem(destoyedItem); - } - else - { - playerIU.addRemovedItem(destoyedItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(destoyedItem); } else { - sendItemList(false); + playerIU.addRemovedItem(destoyedItem); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3583,23 +3542,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > 0)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addRemovedItem(item); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - sendItemList(false); + playerIU.addRemovedItem(item); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3645,45 +3597,31 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(oldItem); } else { - sendItemList(false); + playerIU.addRemovedItem(oldItem); } + sendInventoryUpdate(playerIU); // Send target update packet if (target instanceof PlayerInventory) { final Player targetPlayer = ((PlayerInventory) target).getOwner(); - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate targetIU = new InventoryUpdate(); + if (newItem.getCount() > count) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (newItem.getCount() > count) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } - targetPlayer.sendPacket(playerIU); + targetIU.addModifiedItem(newItem); } else { - targetPlayer.sendItemList(false); + targetIU.addNewItem(newItem); } + targetPlayer.sendPacket(targetIU); } else if (target instanceof PetInventory) { @@ -3786,16 +3724,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(droppedItem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(false); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(droppedItem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3860,16 +3791,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(invitem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(false); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(invitem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 3c666f7e20..acadfda622 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -437,16 +437,9 @@ public class PlayerInventory extends Inventory if (actor != null) { // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(addedItem); - actor.sendInventoryUpdate(playerIU); - } - else - { - actor.sendItemList(false); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(addedItem); + actor.sendInventoryUpdate(playerIU); // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getTemplate()); @@ -511,23 +504,16 @@ public class PlayerInventory extends Inventory // Send inventory update packet if (update) { - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > count)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > count)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addNewItem(item); - } - actor.sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - actor.sendItemList(false); + playerIU.addNewItem(item); } + actor.sendInventoryUpdate(playerIU); } // Notify to scripts @@ -1171,14 +1157,7 @@ public class PlayerInventory extends Inventory } finally { - if (Config.FORCE_INVENTORY_UPDATE) - { - _owner.sendItemList(false); - } - else - { - _owner.sendInventoryUpdate(iu); - } + _owner.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 3954ae70e6..8112d3b2b0 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -161,7 +161,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -176,17 +176,15 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); } + else + { + playerIU.addNewItem(newItem); + } + final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); sm.addItemName(item.getId()); sm.addLong(count); @@ -196,10 +194,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket msg.removeAttachments(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(false); diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 717ac43807..0cb418fbf3 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -207,22 +207,15 @@ public class RequestDestroyItem implements IClientIncomingPacket return; } - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate iu = new InventoryUpdate(); + if (removedItem.getCount() == 0) { - final InventoryUpdate iu = new InventoryUpdate(); - if (removedItem.getCount() == 0) - { - iu.addRemovedItem(removedItem); - } - else - { - iu.addModifiedItem(removedItem); - } - player.sendInventoryUpdate(iu); + iu.addRemovedItem(removedItem); } else { - player.sendItemList(true); + iu.addModifiedItem(removedItem); } + player.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 245d953a0c..4634c1155e 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -401,7 +401,7 @@ public class RequestEnchantItem implements IClientIncomingPacket player.sendPacket(sm); } - if (!Config.FORCE_INVENTORY_UPDATE && (crystals != null)) + if (crystals != null) { iu.addItem(crystals); } diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 7570e3e5e2..6b247a4044 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -163,7 +163,7 @@ public class RequestPackageSend implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder i : _items) { // Check validity of requested item @@ -182,16 +182,13 @@ public class RequestPackageSend implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } // Remove item objects from the world. @@ -202,13 +199,6 @@ public class RequestPackageSend implements IClientIncomingPacket warehouse.deleteMe(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(false); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index bd00745002..77341ce68d 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -184,7 +184,7 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -205,16 +205,13 @@ public class RequestPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); + } + else + { + playerIU.addNewItem(newItem); } final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); @@ -224,10 +221,8 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(false); diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 5014c0b7d0..eb47cc8375 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -310,7 +310,7 @@ public class RequestSendPost implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (AttachmentItem i : _items) { // Check validity of requested item @@ -328,28 +328,19 @@ public class RequestSendPost implements IClientIncomingPacket continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); - if (playerIU != null) + + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(false); - } + player.sendInventoryUpdate(playerIU); return true; } diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index b332fd9707..8e354c0c64 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -168,7 +168,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder itemHolder : _items) { // Check validity of requested item @@ -191,27 +191,17 @@ public class SendWareHouseDepositList implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(false); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/General.ini b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/General.ini index bb5e02c907..4a303da2fc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/General.ini +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/General.ini @@ -238,12 +238,6 @@ StoryQuestRewardBuff = True # Default: True MultipleItemDrop = True -# Forces full item inventory packet to be sent for any item change. -# Notes: -# This can increase network traffic -# Default: False -ForceInventoryUpdate = False - # True = Load html's into cache only on first time html is requested. # False = Load all html's into cache on server startup. # Default: False diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/Config.java index c7a7b6e72f..866f7917cf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/Config.java @@ -498,7 +498,6 @@ public class Config public static boolean AUTODELETE_INVALID_QUEST_DATA; public static boolean ENABLE_STORY_QUEST_BUFF_REWARD; public static boolean MULTIPLE_ITEM_DROP; - public static boolean FORCE_INVENTORY_UPDATE; public static boolean LAZY_CACHE; public static boolean CHECK_HTML_ENCODING; public static boolean CACHE_CHAR_NAMES; @@ -1956,7 +1955,6 @@ public class Config AUTODELETE_INVALID_QUEST_DATA = generalConfig.getBoolean("AutoDeleteInvalidQuestData", false); ENABLE_STORY_QUEST_BUFF_REWARD = generalConfig.getBoolean("StoryQuestRewardBuff", true); MULTIPLE_ITEM_DROP = generalConfig.getBoolean("MultipleItemDrop", true); - FORCE_INVENTORY_UPDATE = generalConfig.getBoolean("ForceInventoryUpdate", false); LAZY_CACHE = generalConfig.getBoolean("LazyCache", true); CHECK_HTML_ENCODING = generalConfig.getBoolean("CheckHtmlEncoding", true); CACHE_CHAR_NAMES = generalConfig.getBoolean("CacheCharNames", true); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/CombatFlag.java index 7385a9fc13..5cd007f840 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -84,16 +83,10 @@ public class CombatFlag _player.sendPacket(sm); // Refresh inventory - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_item); - _player.sendInventoryUpdate(iu); - } - else - { - _player.sendItemList(false); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_item); + _player.sendInventoryUpdate(iu); + // Refresh player stats _player.broadcastUserInfo(); _player.setCombatFlagEquipped(true); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/TradeList.java index b5e239891a..dd67b4b502 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/TradeList.java @@ -589,31 +589,17 @@ public class TradeList else { // Prepare inventory update packet - final InventoryUpdate ownerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); - final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate ownerIU = new InventoryUpdate(); + final InventoryUpdate partnerIU = new InventoryUpdate(); // Transfer items partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); // Send inventory update packet - if (ownerIU != null) - { - _owner.sendInventoryUpdate(ownerIU); - } - else - { - _owner.sendItemList(false); - } + _owner.sendInventoryUpdate(ownerIU); + _partner.sendInventoryUpdate(partnerIU); - if (partnerIU != null) - { - _partner.sendInventoryUpdate(partnerIU); - } - else - { - _partner.sendItemList(false); - } success = true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java index 9a33716f0b..a8d73969f7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -3061,22 +3061,15 @@ public class Player extends Playable _inventory.addAdena(process, count, this, reference); // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) + if (count == getAdena()) { - if (count == getAdena()) - { - sendItemList(false); - } - else - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addModifiedItem(_inventory.getAdenaInstance()); - sendInventoryUpdate(iu); - } + sendItemList(false); } else { - sendItemList(false); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(_inventory.getAdenaInstance()); + sendInventoryUpdate(iu); } } } @@ -3109,16 +3102,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(adenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(false); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(adenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3159,16 +3145,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(beautyTickets); - sendInventoryUpdate(iu); - } - else - { - sendItemList(false); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(beautyTickets); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3211,16 +3190,10 @@ public class Player extends Playable if (count > 0) { _inventory.addAncientAdena(process, count, this, reference); - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_inventory.getAncientAdenaInstance()); - sendInventoryUpdate(iu); - } - else - { - sendItemList(false); - } + + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_inventory.getAncientAdenaInstance()); + sendInventoryUpdate(iu); } } @@ -3251,16 +3224,9 @@ public class Player extends Playable return false; } - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(ancientAdenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(false); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(ancientAdenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3467,23 +3433,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) - { - playerIU.addModifiedItem(destoyedItem); - } - else - { - playerIU.addRemovedItem(destoyedItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(destoyedItem); } else { - sendItemList(false); + playerIU.addRemovedItem(destoyedItem); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3583,23 +3542,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > 0)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addRemovedItem(item); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - sendItemList(false); + playerIU.addRemovedItem(item); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3645,45 +3597,31 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(oldItem); } else { - sendItemList(false); + playerIU.addRemovedItem(oldItem); } + sendInventoryUpdate(playerIU); // Send target update packet if (target instanceof PlayerInventory) { final Player targetPlayer = ((PlayerInventory) target).getOwner(); - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate targetIU = new InventoryUpdate(); + if (newItem.getCount() > count) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (newItem.getCount() > count) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } - targetPlayer.sendPacket(playerIU); + targetIU.addModifiedItem(newItem); } else { - targetPlayer.sendItemList(false); + targetIU.addNewItem(newItem); } + targetPlayer.sendPacket(targetIU); } else if (target instanceof PetInventory) { @@ -3786,16 +3724,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(droppedItem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(false); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(droppedItem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3860,16 +3791,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(invitem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(false); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(invitem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 3f34a105dc..a08d88a394 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -437,16 +437,9 @@ public class PlayerInventory extends Inventory if (actor != null) { // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(addedItem); - actor.sendInventoryUpdate(playerIU); - } - else - { - actor.sendItemList(false); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(addedItem); + actor.sendInventoryUpdate(playerIU); // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getTemplate()); @@ -511,23 +504,16 @@ public class PlayerInventory extends Inventory // Send inventory update packet if (update) { - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > count)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > count)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addNewItem(item); - } - actor.sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - actor.sendItemList(false); + playerIU.addNewItem(item); } + actor.sendInventoryUpdate(playerIU); } // Notify to scripts @@ -1175,14 +1161,7 @@ public class PlayerInventory extends Inventory } finally { - if (Config.FORCE_INVENTORY_UPDATE) - { - _owner.sendItemList(false); - } - else - { - _owner.sendInventoryUpdate(iu); - } + _owner.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 3954ae70e6..8112d3b2b0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -161,7 +161,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -176,17 +176,15 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); } + else + { + playerIU.addNewItem(newItem); + } + final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); sm.addItemName(item.getId()); sm.addLong(count); @@ -196,10 +194,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket msg.removeAttachments(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(false); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 717ac43807..0cb418fbf3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -207,22 +207,15 @@ public class RequestDestroyItem implements IClientIncomingPacket return; } - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate iu = new InventoryUpdate(); + if (removedItem.getCount() == 0) { - final InventoryUpdate iu = new InventoryUpdate(); - if (removedItem.getCount() == 0) - { - iu.addRemovedItem(removedItem); - } - else - { - iu.addModifiedItem(removedItem); - } - player.sendInventoryUpdate(iu); + iu.addRemovedItem(removedItem); } else { - player.sendItemList(true); + iu.addModifiedItem(removedItem); } + player.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 245d953a0c..4634c1155e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -401,7 +401,7 @@ public class RequestEnchantItem implements IClientIncomingPacket player.sendPacket(sm); } - if (!Config.FORCE_INVENTORY_UPDATE && (crystals != null)) + if (crystals != null) { iu.addItem(crystals); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 7570e3e5e2..6b247a4044 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -163,7 +163,7 @@ public class RequestPackageSend implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder i : _items) { // Check validity of requested item @@ -182,16 +182,13 @@ public class RequestPackageSend implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } // Remove item objects from the world. @@ -202,13 +199,6 @@ public class RequestPackageSend implements IClientIncomingPacket warehouse.deleteMe(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(false); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index bd00745002..77341ce68d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -184,7 +184,7 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -205,16 +205,13 @@ public class RequestPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); + } + else + { + playerIU.addNewItem(newItem); } final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); @@ -224,10 +221,8 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(false); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 5014c0b7d0..eb47cc8375 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -310,7 +310,7 @@ public class RequestSendPost implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (AttachmentItem i : _items) { // Check validity of requested item @@ -328,28 +328,19 @@ public class RequestSendPost implements IClientIncomingPacket continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); - if (playerIU != null) + + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(false); - } + player.sendInventoryUpdate(playerIU); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index b332fd9707..8e354c0c64 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -168,7 +168,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder itemHolder : _items) { // Check validity of requested item @@ -191,27 +191,17 @@ public class SendWareHouseDepositList implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(false); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/config/General.ini b/L2J_Mobius_Classic_2.5_Zaken/dist/game/config/General.ini index bb5e02c907..4a303da2fc 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/config/General.ini +++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/config/General.ini @@ -238,12 +238,6 @@ StoryQuestRewardBuff = True # Default: True MultipleItemDrop = True -# Forces full item inventory packet to be sent for any item change. -# Notes: -# This can increase network traffic -# Default: False -ForceInventoryUpdate = False - # True = Load html's into cache only on first time html is requested. # False = Load all html's into cache on server startup. # Default: False diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/Config.java index 2e5c5be464..51ab85febc 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/Config.java @@ -498,7 +498,6 @@ public class Config public static boolean AUTODELETE_INVALID_QUEST_DATA; public static boolean ENABLE_STORY_QUEST_BUFF_REWARD; public static boolean MULTIPLE_ITEM_DROP; - public static boolean FORCE_INVENTORY_UPDATE; public static boolean LAZY_CACHE; public static boolean CHECK_HTML_ENCODING; public static boolean CACHE_CHAR_NAMES; @@ -1960,7 +1959,6 @@ public class Config AUTODELETE_INVALID_QUEST_DATA = generalConfig.getBoolean("AutoDeleteInvalidQuestData", false); ENABLE_STORY_QUEST_BUFF_REWARD = generalConfig.getBoolean("StoryQuestRewardBuff", true); MULTIPLE_ITEM_DROP = generalConfig.getBoolean("MultipleItemDrop", true); - FORCE_INVENTORY_UPDATE = generalConfig.getBoolean("ForceInventoryUpdate", false); LAZY_CACHE = generalConfig.getBoolean("LazyCache", true); CHECK_HTML_ENCODING = generalConfig.getBoolean("CheckHtmlEncoding", true); CACHE_CHAR_NAMES = generalConfig.getBoolean("CacheCharNames", true); diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/CombatFlag.java index 7385a9fc13..5cd007f840 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -84,16 +83,10 @@ public class CombatFlag _player.sendPacket(sm); // Refresh inventory - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_item); - _player.sendInventoryUpdate(iu); - } - else - { - _player.sendItemList(false); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_item); + _player.sendInventoryUpdate(iu); + // Refresh player stats _player.broadcastUserInfo(); _player.setCombatFlagEquipped(true); diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/TradeList.java index 6f2dc0bcd2..97554769e1 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/TradeList.java @@ -591,31 +591,17 @@ public class TradeList else { // Prepare inventory update packet - final InventoryUpdate ownerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); - final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate ownerIU = new InventoryUpdate(); + final InventoryUpdate partnerIU = new InventoryUpdate(); // Transfer items partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); // Send inventory update packet - if (ownerIU != null) - { - _owner.sendInventoryUpdate(ownerIU); - } - else - { - _owner.sendItemList(false); - } + _owner.sendInventoryUpdate(ownerIU); + _partner.sendInventoryUpdate(partnerIU); - if (partnerIU != null) - { - _partner.sendInventoryUpdate(partnerIU); - } - else - { - _partner.sendItemList(false); - } success = true; } diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java index 012c7d9198..06a781cd42 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -3061,22 +3061,15 @@ public class Player extends Playable _inventory.addAdena(process, count, this, reference); // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) + if (count == getAdena()) { - if (count == getAdena()) - { - sendItemList(false); - } - else - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addModifiedItem(_inventory.getAdenaInstance()); - sendInventoryUpdate(iu); - } + sendItemList(false); } else { - sendItemList(false); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(_inventory.getAdenaInstance()); + sendInventoryUpdate(iu); } } } @@ -3109,16 +3102,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(adenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(false); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(adenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3159,16 +3145,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(beautyTickets); - sendInventoryUpdate(iu); - } - else - { - sendItemList(false); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(beautyTickets); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3211,16 +3190,10 @@ public class Player extends Playable if (count > 0) { _inventory.addAncientAdena(process, count, this, reference); - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_inventory.getAncientAdenaInstance()); - sendInventoryUpdate(iu); - } - else - { - sendItemList(false); - } + + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_inventory.getAncientAdenaInstance()); + sendInventoryUpdate(iu); } } @@ -3251,16 +3224,9 @@ public class Player extends Playable return false; } - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(ancientAdenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(false); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(ancientAdenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3467,23 +3433,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) - { - playerIU.addModifiedItem(destoyedItem); - } - else - { - playerIU.addRemovedItem(destoyedItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(destoyedItem); } else { - sendItemList(false); + playerIU.addRemovedItem(destoyedItem); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3583,23 +3542,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > 0)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addRemovedItem(item); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - sendItemList(false); + playerIU.addRemovedItem(item); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3645,45 +3597,31 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(oldItem); } else { - sendItemList(false); + playerIU.addRemovedItem(oldItem); } + sendInventoryUpdate(playerIU); // Send target update packet if (target instanceof PlayerInventory) { final Player targetPlayer = ((PlayerInventory) target).getOwner(); - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate targetIU = new InventoryUpdate(); + if (newItem.getCount() > count) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (newItem.getCount() > count) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } - targetPlayer.sendPacket(playerIU); + targetIU.addModifiedItem(newItem); } else { - targetPlayer.sendItemList(false); + targetIU.addNewItem(newItem); } + targetPlayer.sendPacket(targetIU); } else if (target instanceof PetInventory) { @@ -3786,16 +3724,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(droppedItem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(false); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(droppedItem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3860,16 +3791,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(invitem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(false); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(invitem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 3f34a105dc..a08d88a394 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -437,16 +437,9 @@ public class PlayerInventory extends Inventory if (actor != null) { // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(addedItem); - actor.sendInventoryUpdate(playerIU); - } - else - { - actor.sendItemList(false); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(addedItem); + actor.sendInventoryUpdate(playerIU); // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getTemplate()); @@ -511,23 +504,16 @@ public class PlayerInventory extends Inventory // Send inventory update packet if (update) { - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > count)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > count)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addNewItem(item); - } - actor.sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - actor.sendItemList(false); + playerIU.addNewItem(item); } + actor.sendInventoryUpdate(playerIU); } // Notify to scripts @@ -1175,14 +1161,7 @@ public class PlayerInventory extends Inventory } finally { - if (Config.FORCE_INVENTORY_UPDATE) - { - _owner.sendItemList(false); - } - else - { - _owner.sendInventoryUpdate(iu); - } + _owner.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 3954ae70e6..8112d3b2b0 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -161,7 +161,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -176,17 +176,15 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); } + else + { + playerIU.addNewItem(newItem); + } + final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); sm.addItemName(item.getId()); sm.addLong(count); @@ -196,10 +194,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket msg.removeAttachments(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(false); diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 717ac43807..0cb418fbf3 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -207,22 +207,15 @@ public class RequestDestroyItem implements IClientIncomingPacket return; } - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate iu = new InventoryUpdate(); + if (removedItem.getCount() == 0) { - final InventoryUpdate iu = new InventoryUpdate(); - if (removedItem.getCount() == 0) - { - iu.addRemovedItem(removedItem); - } - else - { - iu.addModifiedItem(removedItem); - } - player.sendInventoryUpdate(iu); + iu.addRemovedItem(removedItem); } else { - player.sendItemList(true); + iu.addModifiedItem(removedItem); } + player.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 245d953a0c..4634c1155e 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -401,7 +401,7 @@ public class RequestEnchantItem implements IClientIncomingPacket player.sendPacket(sm); } - if (!Config.FORCE_INVENTORY_UPDATE && (crystals != null)) + if (crystals != null) { iu.addItem(crystals); } diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 7570e3e5e2..6b247a4044 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -163,7 +163,7 @@ public class RequestPackageSend implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder i : _items) { // Check validity of requested item @@ -182,16 +182,13 @@ public class RequestPackageSend implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } // Remove item objects from the world. @@ -202,13 +199,6 @@ public class RequestPackageSend implements IClientIncomingPacket warehouse.deleteMe(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(false); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index bd00745002..77341ce68d 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -184,7 +184,7 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -205,16 +205,13 @@ public class RequestPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); + } + else + { + playerIU.addNewItem(newItem); } final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); @@ -224,10 +221,8 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(false); diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 5014c0b7d0..eb47cc8375 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -310,7 +310,7 @@ public class RequestSendPost implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (AttachmentItem i : _items) { // Check validity of requested item @@ -328,28 +328,19 @@ public class RequestSendPost implements IClientIncomingPacket continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); - if (playerIU != null) + + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(false); - } + player.sendInventoryUpdate(playerIU); return true; } diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index b332fd9707..8e354c0c64 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -168,7 +168,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder itemHolder : _items) { // Check validity of requested item @@ -191,27 +191,17 @@ public class SendWareHouseDepositList implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(false); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/config/General.ini b/L2J_Mobius_Classic_2.7_Antharas/dist/game/config/General.ini index bb5e02c907..4a303da2fc 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/config/General.ini +++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/config/General.ini @@ -238,12 +238,6 @@ StoryQuestRewardBuff = True # Default: True MultipleItemDrop = True -# Forces full item inventory packet to be sent for any item change. -# Notes: -# This can increase network traffic -# Default: False -ForceInventoryUpdate = False - # True = Load html's into cache only on first time html is requested. # False = Load all html's into cache on server startup. # Default: False diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/Config.java index 2e5c5be464..51ab85febc 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/Config.java @@ -498,7 +498,6 @@ public class Config public static boolean AUTODELETE_INVALID_QUEST_DATA; public static boolean ENABLE_STORY_QUEST_BUFF_REWARD; public static boolean MULTIPLE_ITEM_DROP; - public static boolean FORCE_INVENTORY_UPDATE; public static boolean LAZY_CACHE; public static boolean CHECK_HTML_ENCODING; public static boolean CACHE_CHAR_NAMES; @@ -1960,7 +1959,6 @@ public class Config AUTODELETE_INVALID_QUEST_DATA = generalConfig.getBoolean("AutoDeleteInvalidQuestData", false); ENABLE_STORY_QUEST_BUFF_REWARD = generalConfig.getBoolean("StoryQuestRewardBuff", true); MULTIPLE_ITEM_DROP = generalConfig.getBoolean("MultipleItemDrop", true); - FORCE_INVENTORY_UPDATE = generalConfig.getBoolean("ForceInventoryUpdate", false); LAZY_CACHE = generalConfig.getBoolean("LazyCache", true); CHECK_HTML_ENCODING = generalConfig.getBoolean("CheckHtmlEncoding", true); CACHE_CHAR_NAMES = generalConfig.getBoolean("CacheCharNames", true); diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/CombatFlag.java index 833b9a4a6c..67d4aaf198 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -84,16 +83,10 @@ public class CombatFlag _player.sendPacket(sm); // Refresh inventory - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_item); - _player.sendInventoryUpdate(iu); - } - else - { - _player.sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_item); + _player.sendInventoryUpdate(iu); + // Refresh player stats _player.broadcastUserInfo(); _player.setCombatFlagEquipped(true); diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/TradeList.java index 531d70d789..0cb8de3cc5 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/TradeList.java @@ -591,31 +591,17 @@ public class TradeList else { // Prepare inventory update packet - final InventoryUpdate ownerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); - final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate ownerIU = new InventoryUpdate(); + final InventoryUpdate partnerIU = new InventoryUpdate(); // Transfer items partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); - // Send inventory update packet - if (ownerIU != null) - { - _owner.sendInventoryUpdate(ownerIU); - } - else - { - _owner.sendItemList(); - } + // Send inventory update packets + _owner.sendInventoryUpdate(ownerIU); + _partner.sendInventoryUpdate(partnerIU); - if (partnerIU != null) - { - _partner.sendInventoryUpdate(partnerIU); - } - else - { - _partner.sendItemList(); - } success = true; } diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java index b6883add1f..5b515cee7d 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -3059,22 +3059,15 @@ public class Player extends Playable _inventory.addAdena(process, count, this, reference); // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) + if (count == getAdena()) { - if (count == getAdena()) - { - sendItemList(); - } - else - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addModifiedItem(_inventory.getAdenaInstance()); - sendInventoryUpdate(iu); - } + sendItemList(); } else { - sendItemList(); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(_inventory.getAdenaInstance()); + sendInventoryUpdate(iu); } } } @@ -3107,16 +3100,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(adenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(adenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3157,16 +3143,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(beautyTickets); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(beautyTickets); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3209,16 +3188,10 @@ public class Player extends Playable if (count > 0) { _inventory.addAncientAdena(process, count, this, reference); - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_inventory.getAncientAdenaInstance()); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_inventory.getAncientAdenaInstance()); + sendInventoryUpdate(iu); } } @@ -3249,16 +3222,9 @@ public class Player extends Playable return false; } - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(ancientAdenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(ancientAdenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3465,23 +3431,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) - { - playerIU.addModifiedItem(destoyedItem); - } - else - { - playerIU.addRemovedItem(destoyedItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(destoyedItem); } else { - sendItemList(); + playerIU.addRemovedItem(destoyedItem); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3581,23 +3540,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > 0)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addRemovedItem(item); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - sendItemList(); + playerIU.addRemovedItem(item); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3643,45 +3595,31 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(oldItem); } else { - sendItemList(); + playerIU.addRemovedItem(oldItem); } + sendInventoryUpdate(playerIU); // Send target update packet if (target instanceof PlayerInventory) { final Player targetPlayer = ((PlayerInventory) target).getOwner(); - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate targetIU = new InventoryUpdate(); + if (newItem.getCount() > count) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (newItem.getCount() > count) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } - targetPlayer.sendPacket(playerIU); + targetIU.addModifiedItem(newItem); } else { - targetPlayer.sendItemList(); + targetIU.addNewItem(newItem); } + targetPlayer.sendPacket(targetIU); } return newItem; } @@ -3770,16 +3708,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(droppedItem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(droppedItem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3844,16 +3775,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(invitem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(invitem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index b5de8b0e2c..c11ae1861c 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -441,16 +441,9 @@ public class PlayerInventory extends Inventory if (actor != null) { // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(addedItem); - actor.sendInventoryUpdate(playerIU); - } - else - { - actor.sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(addedItem); + actor.sendInventoryUpdate(playerIU); // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getTemplate()); @@ -515,23 +508,16 @@ public class PlayerInventory extends Inventory // Send inventory update packet if (update) { - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > count)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > count)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addNewItem(item); - } - actor.sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - actor.sendItemList(); + playerIU.addNewItem(item); } + actor.sendInventoryUpdate(playerIU); } // Notify to scripts @@ -1216,14 +1202,7 @@ public class PlayerInventory extends Inventory } finally { - if (Config.FORCE_INVENTORY_UPDATE) - { - _owner.sendItemList(); - } - else - { - _owner.sendInventoryUpdate(iu); - } + _owner.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 1d6a4dc9bf..09ec930191 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -161,7 +161,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -176,17 +176,15 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); } + else + { + playerIU.addNewItem(newItem); + } + final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); sm.addItemName(item.getId()); sm.addLong(count); @@ -196,10 +194,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket msg.removeAttachments(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(); diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 5b26246871..0cb418fbf3 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -207,22 +207,15 @@ public class RequestDestroyItem implements IClientIncomingPacket return; } - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate iu = new InventoryUpdate(); + if (removedItem.getCount() == 0) { - final InventoryUpdate iu = new InventoryUpdate(); - if (removedItem.getCount() == 0) - { - iu.addRemovedItem(removedItem); - } - else - { - iu.addModifiedItem(removedItem); - } - player.sendInventoryUpdate(iu); + iu.addRemovedItem(removedItem); } else { - player.sendItemList(); + iu.addModifiedItem(removedItem); } + player.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 5f3a666fac..dee5c93762 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -401,7 +401,7 @@ public class RequestEnchantItem implements IClientIncomingPacket player.sendPacket(sm); } - if (!Config.FORCE_INVENTORY_UPDATE && (crystals != null)) + if (crystals != null) { iu.addItem(crystals); } diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 62b2ef4c5a..6b247a4044 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -163,7 +163,7 @@ public class RequestPackageSend implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder i : _items) { // Check validity of requested item @@ -182,16 +182,13 @@ public class RequestPackageSend implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } // Remove item objects from the world. @@ -202,13 +199,6 @@ public class RequestPackageSend implements IClientIncomingPacket warehouse.deleteMe(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index e2bf417fa1..a64b93a4bf 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -184,7 +184,7 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -205,16 +205,13 @@ public class RequestPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); + } + else + { + playerIU.addNewItem(newItem); } final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); @@ -224,10 +221,8 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(); diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 9f217064bb..eb47cc8375 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -310,7 +310,7 @@ public class RequestSendPost implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (AttachmentItem i : _items) { // Check validity of requested item @@ -328,28 +328,19 @@ public class RequestSendPost implements IClientIncomingPacket continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); - if (playerIU != null) + + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); return true; } diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 1c02a4a421..8e354c0c64 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -168,7 +168,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder itemHolder : _items) { // Check validity of requested item @@ -191,27 +191,17 @@ public class SendWareHouseDepositList implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/config/General.ini b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/config/General.ini index bb5e02c907..4a303da2fc 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/config/General.ini +++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/config/General.ini @@ -238,12 +238,6 @@ StoryQuestRewardBuff = True # Default: True MultipleItemDrop = True -# Forces full item inventory packet to be sent for any item change. -# Notes: -# This can increase network traffic -# Default: False -ForceInventoryUpdate = False - # True = Load html's into cache only on first time html is requested. # False = Load all html's into cache on server startup. # Default: False diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/Config.java index 2e5c5be464..51ab85febc 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/Config.java @@ -498,7 +498,6 @@ public class Config public static boolean AUTODELETE_INVALID_QUEST_DATA; public static boolean ENABLE_STORY_QUEST_BUFF_REWARD; public static boolean MULTIPLE_ITEM_DROP; - public static boolean FORCE_INVENTORY_UPDATE; public static boolean LAZY_CACHE; public static boolean CHECK_HTML_ENCODING; public static boolean CACHE_CHAR_NAMES; @@ -1960,7 +1959,6 @@ public class Config AUTODELETE_INVALID_QUEST_DATA = generalConfig.getBoolean("AutoDeleteInvalidQuestData", false); ENABLE_STORY_QUEST_BUFF_REWARD = generalConfig.getBoolean("StoryQuestRewardBuff", true); MULTIPLE_ITEM_DROP = generalConfig.getBoolean("MultipleItemDrop", true); - FORCE_INVENTORY_UPDATE = generalConfig.getBoolean("ForceInventoryUpdate", false); LAZY_CACHE = generalConfig.getBoolean("LazyCache", true); CHECK_HTML_ENCODING = generalConfig.getBoolean("CheckHtmlEncoding", true); CACHE_CHAR_NAMES = generalConfig.getBoolean("CacheCharNames", true); diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/CombatFlag.java index e0487f9079..e743f8e5c2 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -82,16 +81,10 @@ public class CombatFlag _player.sendPacket(sm); // Refresh inventory - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_item); - _player.sendInventoryUpdate(iu); - } - else - { - _player.sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_item); + _player.sendInventoryUpdate(iu); + // Refresh player stats _player.broadcastUserInfo(); _player.setCombatFlagEquipped(true); diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/TradeList.java index 531d70d789..0cb8de3cc5 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/TradeList.java @@ -591,31 +591,17 @@ public class TradeList else { // Prepare inventory update packet - final InventoryUpdate ownerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); - final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate ownerIU = new InventoryUpdate(); + final InventoryUpdate partnerIU = new InventoryUpdate(); // Transfer items partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); - // Send inventory update packet - if (ownerIU != null) - { - _owner.sendInventoryUpdate(ownerIU); - } - else - { - _owner.sendItemList(); - } + // Send inventory update packets + _owner.sendInventoryUpdate(ownerIU); + _partner.sendInventoryUpdate(partnerIU); - if (partnerIU != null) - { - _partner.sendInventoryUpdate(partnerIU); - } - else - { - _partner.sendItemList(); - } success = true; } diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java index f38750931b..fc5ab80dfc 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -3086,22 +3086,15 @@ public class Player extends Playable _inventory.addAdena(process, count, this, reference); // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) + if (count == getAdena()) { - if (count == getAdena()) - { - sendItemList(); - } - else - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addModifiedItem(_inventory.getAdenaInstance()); - sendInventoryUpdate(iu); - } + sendItemList(); } else { - sendItemList(); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(_inventory.getAdenaInstance()); + sendInventoryUpdate(iu); } } } @@ -3134,16 +3127,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(adenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(adenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3184,16 +3170,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(beautyTickets); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(beautyTickets); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3236,16 +3215,10 @@ public class Player extends Playable if (count > 0) { _inventory.addAncientAdena(process, count, this, reference); - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_inventory.getAncientAdenaInstance()); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_inventory.getAncientAdenaInstance()); + sendInventoryUpdate(iu); } } @@ -3276,16 +3249,9 @@ public class Player extends Playable return false; } - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(ancientAdenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(ancientAdenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3492,23 +3458,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) - { - playerIU.addModifiedItem(destoyedItem); - } - else - { - playerIU.addRemovedItem(destoyedItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(destoyedItem); } else { - sendItemList(); + playerIU.addRemovedItem(destoyedItem); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3608,23 +3567,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > 0)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addRemovedItem(item); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - sendItemList(); + playerIU.addRemovedItem(item); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3670,45 +3622,31 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(oldItem); } else { - sendItemList(); + playerIU.addRemovedItem(oldItem); } + sendInventoryUpdate(playerIU); // Send target update packet if (target instanceof PlayerInventory) { final Player targetPlayer = ((PlayerInventory) target).getOwner(); - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate targetIU = new InventoryUpdate(); + if (newItem.getCount() > count) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (newItem.getCount() > count) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } - targetPlayer.sendPacket(playerIU); + targetIU.addModifiedItem(newItem); } else { - targetPlayer.sendItemList(); + targetIU.addNewItem(newItem); } + targetPlayer.sendPacket(targetIU); } return newItem; } @@ -3797,16 +3735,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(droppedItem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(droppedItem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3871,16 +3802,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(invitem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(invitem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index b5de8b0e2c..c11ae1861c 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -441,16 +441,9 @@ public class PlayerInventory extends Inventory if (actor != null) { // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(addedItem); - actor.sendInventoryUpdate(playerIU); - } - else - { - actor.sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(addedItem); + actor.sendInventoryUpdate(playerIU); // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getTemplate()); @@ -515,23 +508,16 @@ public class PlayerInventory extends Inventory // Send inventory update packet if (update) { - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > count)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > count)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addNewItem(item); - } - actor.sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - actor.sendItemList(); + playerIU.addNewItem(item); } + actor.sendInventoryUpdate(playerIU); } // Notify to scripts @@ -1216,14 +1202,7 @@ public class PlayerInventory extends Inventory } finally { - if (Config.FORCE_INVENTORY_UPDATE) - { - _owner.sendItemList(); - } - else - { - _owner.sendInventoryUpdate(iu); - } + _owner.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 1d6a4dc9bf..09ec930191 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -161,7 +161,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -176,17 +176,15 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); } + else + { + playerIU.addNewItem(newItem); + } + final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); sm.addItemName(item.getId()); sm.addLong(count); @@ -196,10 +194,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket msg.removeAttachments(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(); diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 5b26246871..0cb418fbf3 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -207,22 +207,15 @@ public class RequestDestroyItem implements IClientIncomingPacket return; } - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate iu = new InventoryUpdate(); + if (removedItem.getCount() == 0) { - final InventoryUpdate iu = new InventoryUpdate(); - if (removedItem.getCount() == 0) - { - iu.addRemovedItem(removedItem); - } - else - { - iu.addModifiedItem(removedItem); - } - player.sendInventoryUpdate(iu); + iu.addRemovedItem(removedItem); } else { - player.sendItemList(); + iu.addModifiedItem(removedItem); } + player.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 5f3a666fac..dee5c93762 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -401,7 +401,7 @@ public class RequestEnchantItem implements IClientIncomingPacket player.sendPacket(sm); } - if (!Config.FORCE_INVENTORY_UPDATE && (crystals != null)) + if (crystals != null) { iu.addItem(crystals); } diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 62b2ef4c5a..6b247a4044 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -163,7 +163,7 @@ public class RequestPackageSend implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder i : _items) { // Check validity of requested item @@ -182,16 +182,13 @@ public class RequestPackageSend implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } // Remove item objects from the world. @@ -202,13 +199,6 @@ public class RequestPackageSend implements IClientIncomingPacket warehouse.deleteMe(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index e2bf417fa1..a64b93a4bf 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -184,7 +184,7 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -205,16 +205,13 @@ public class RequestPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); + } + else + { + playerIU.addNewItem(newItem); } final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); @@ -224,10 +221,8 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(); diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 9f217064bb..eb47cc8375 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -310,7 +310,7 @@ public class RequestSendPost implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (AttachmentItem i : _items) { // Check validity of requested item @@ -328,28 +328,19 @@ public class RequestSendPost implements IClientIncomingPacket continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); - if (playerIU != null) + + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); return true; } diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 1c02a4a421..8e354c0c64 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -168,7 +168,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder itemHolder : _items) { // Check validity of requested item @@ -191,27 +191,17 @@ public class SendWareHouseDepositList implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/config/General.ini b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/config/General.ini index bb5e02c907..4a303da2fc 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/config/General.ini +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/config/General.ini @@ -238,12 +238,6 @@ StoryQuestRewardBuff = True # Default: True MultipleItemDrop = True -# Forces full item inventory packet to be sent for any item change. -# Notes: -# This can increase network traffic -# Default: False -ForceInventoryUpdate = False - # True = Load html's into cache only on first time html is requested. # False = Load all html's into cache on server startup. # Default: False diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/Config.java index 4a6a683404..217e6e5b6a 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/Config.java @@ -498,7 +498,6 @@ public class Config public static boolean AUTODELETE_INVALID_QUEST_DATA; public static boolean ENABLE_STORY_QUEST_BUFF_REWARD; public static boolean MULTIPLE_ITEM_DROP; - public static boolean FORCE_INVENTORY_UPDATE; public static boolean LAZY_CACHE; public static boolean CHECK_HTML_ENCODING; public static boolean CACHE_CHAR_NAMES; @@ -1969,7 +1968,6 @@ public class Config AUTODELETE_INVALID_QUEST_DATA = generalConfig.getBoolean("AutoDeleteInvalidQuestData", false); ENABLE_STORY_QUEST_BUFF_REWARD = generalConfig.getBoolean("StoryQuestRewardBuff", true); MULTIPLE_ITEM_DROP = generalConfig.getBoolean("MultipleItemDrop", true); - FORCE_INVENTORY_UPDATE = generalConfig.getBoolean("ForceInventoryUpdate", false); LAZY_CACHE = generalConfig.getBoolean("LazyCache", true); CHECK_HTML_ENCODING = generalConfig.getBoolean("CheckHtmlEncoding", true); CACHE_CHAR_NAMES = generalConfig.getBoolean("CacheCharNames", true); diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/CombatFlag.java index e0487f9079..e743f8e5c2 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -82,16 +81,10 @@ public class CombatFlag _player.sendPacket(sm); // Refresh inventory - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_item); - _player.sendInventoryUpdate(iu); - } - else - { - _player.sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_item); + _player.sendInventoryUpdate(iu); + // Refresh player stats _player.broadcastUserInfo(); _player.setCombatFlagEquipped(true); diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/TradeList.java index 531d70d789..0cb8de3cc5 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/TradeList.java @@ -591,31 +591,17 @@ public class TradeList else { // Prepare inventory update packet - final InventoryUpdate ownerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); - final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate ownerIU = new InventoryUpdate(); + final InventoryUpdate partnerIU = new InventoryUpdate(); // Transfer items partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); - // Send inventory update packet - if (ownerIU != null) - { - _owner.sendInventoryUpdate(ownerIU); - } - else - { - _owner.sendItemList(); - } + // Send inventory update packets + _owner.sendInventoryUpdate(ownerIU); + _partner.sendInventoryUpdate(partnerIU); - if (partnerIU != null) - { - _partner.sendInventoryUpdate(partnerIU); - } - else - { - _partner.sendItemList(); - } success = true; } diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java index 5ccc0d49ad..b9491ee146 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -3086,22 +3086,15 @@ public class Player extends Playable _inventory.addAdena(process, count, this, reference); // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) + if (count == getAdena()) { - if (count == getAdena()) - { - sendItemList(); - } - else - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addModifiedItem(_inventory.getAdenaInstance()); - sendInventoryUpdate(iu); - } + sendItemList(); } else { - sendItemList(); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(_inventory.getAdenaInstance()); + sendInventoryUpdate(iu); } } } @@ -3134,16 +3127,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(adenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(adenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3184,16 +3170,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(beautyTickets); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(beautyTickets); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3236,16 +3215,10 @@ public class Player extends Playable if (count > 0) { _inventory.addAncientAdena(process, count, this, reference); - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_inventory.getAncientAdenaInstance()); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_inventory.getAncientAdenaInstance()); + sendInventoryUpdate(iu); } } @@ -3276,16 +3249,9 @@ public class Player extends Playable return false; } - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(ancientAdenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(ancientAdenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3492,23 +3458,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) - { - playerIU.addModifiedItem(destoyedItem); - } - else - { - playerIU.addRemovedItem(destoyedItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(destoyedItem); } else { - sendItemList(); + playerIU.addRemovedItem(destoyedItem); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3608,23 +3567,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > 0)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addRemovedItem(item); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - sendItemList(); + playerIU.addRemovedItem(item); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3670,45 +3622,31 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(oldItem); } else { - sendItemList(); + playerIU.addRemovedItem(oldItem); } + sendInventoryUpdate(playerIU); // Send target update packet if (target instanceof PlayerInventory) { final Player targetPlayer = ((PlayerInventory) target).getOwner(); - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate targetIU = new InventoryUpdate(); + if (newItem.getCount() > count) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (newItem.getCount() > count) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } - targetPlayer.sendPacket(playerIU); + targetIU.addModifiedItem(newItem); } else { - targetPlayer.sendItemList(); + targetIU.addNewItem(newItem); } + targetPlayer.sendPacket(targetIU); } return newItem; } @@ -3797,16 +3735,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(droppedItem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(droppedItem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3871,16 +3802,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(invitem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(invitem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index b5de8b0e2c..c11ae1861c 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -441,16 +441,9 @@ public class PlayerInventory extends Inventory if (actor != null) { // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(addedItem); - actor.sendInventoryUpdate(playerIU); - } - else - { - actor.sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(addedItem); + actor.sendInventoryUpdate(playerIU); // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getTemplate()); @@ -515,23 +508,16 @@ public class PlayerInventory extends Inventory // Send inventory update packet if (update) { - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > count)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > count)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addNewItem(item); - } - actor.sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - actor.sendItemList(); + playerIU.addNewItem(item); } + actor.sendInventoryUpdate(playerIU); } // Notify to scripts @@ -1216,14 +1202,7 @@ public class PlayerInventory extends Inventory } finally { - if (Config.FORCE_INVENTORY_UPDATE) - { - _owner.sendItemList(); - } - else - { - _owner.sendInventoryUpdate(iu); - } + _owner.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 1d6a4dc9bf..09ec930191 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -161,7 +161,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -176,17 +176,15 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); } + else + { + playerIU.addNewItem(newItem); + } + final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); sm.addItemName(item.getId()); sm.addLong(count); @@ -196,10 +194,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket msg.removeAttachments(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(); diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 7e05426603..41154e77ac 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -207,22 +207,15 @@ public class RequestDestroyItem implements IClientIncomingPacket return; } - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate iu = new InventoryUpdate(); + if (removedItem.getCount() == 0) { - final InventoryUpdate iu = new InventoryUpdate(); - if (removedItem.getCount() == 0) - { - iu.addRemovedItem(removedItem); - } - else - { - iu.addModifiedItem(removedItem); - } - player.sendInventoryUpdate(iu); + iu.addRemovedItem(removedItem); } else { - player.sendItemList(); + iu.addModifiedItem(removedItem); } + player.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 189197b44f..371bc52d9d 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -403,7 +403,7 @@ public class RequestEnchantItem implements IClientIncomingPacket player.sendPacket(sm); } - if (!Config.FORCE_INVENTORY_UPDATE && (crystals != null)) + if (crystals != null) { iu.addItem(crystals); } diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 62b2ef4c5a..6b247a4044 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -163,7 +163,7 @@ public class RequestPackageSend implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder i : _items) { // Check validity of requested item @@ -182,16 +182,13 @@ public class RequestPackageSend implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } // Remove item objects from the world. @@ -202,13 +199,6 @@ public class RequestPackageSend implements IClientIncomingPacket warehouse.deleteMe(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index e2bf417fa1..a64b93a4bf 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -184,7 +184,7 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -205,16 +205,13 @@ public class RequestPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); + } + else + { + playerIU.addNewItem(newItem); } final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); @@ -224,10 +221,8 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(); diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 9f217064bb..eb47cc8375 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -310,7 +310,7 @@ public class RequestSendPost implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (AttachmentItem i : _items) { // Check validity of requested item @@ -328,28 +328,19 @@ public class RequestSendPost implements IClientIncomingPacket continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); - if (playerIU != null) + + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); return true; } diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 1c02a4a421..8e354c0c64 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -168,7 +168,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder itemHolder : _items) { // Check validity of requested item @@ -191,27 +191,17 @@ public class SendWareHouseDepositList implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/General.ini b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/General.ini index 7fcc7b0fc3..0268db8756 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/General.ini +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/General.ini @@ -238,12 +238,6 @@ StoryQuestRewardBuff = True # Default: True MultipleItemDrop = True -# Forces full item inventory packet to be sent for any item change. -# Notes: -# This can increase network traffic -# Default: False -ForceInventoryUpdate = False - # True = Load html's into cache only on first time html is requested. # False = Load all html's into cache on server startup. # Default: False diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/Config.java index b7cfecb104..0ab627c47d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/Config.java @@ -498,7 +498,6 @@ public class Config public static boolean AUTODELETE_INVALID_QUEST_DATA; public static boolean ENABLE_STORY_QUEST_BUFF_REWARD; public static boolean MULTIPLE_ITEM_DROP; - public static boolean FORCE_INVENTORY_UPDATE; public static boolean LAZY_CACHE; public static boolean CHECK_HTML_ENCODING; public static boolean CACHE_CHAR_NAMES; @@ -2009,7 +2008,6 @@ public class Config AUTODELETE_INVALID_QUEST_DATA = generalConfig.getBoolean("AutoDeleteInvalidQuestData", false); ENABLE_STORY_QUEST_BUFF_REWARD = generalConfig.getBoolean("StoryQuestRewardBuff", true); MULTIPLE_ITEM_DROP = generalConfig.getBoolean("MultipleItemDrop", true); - FORCE_INVENTORY_UPDATE = generalConfig.getBoolean("ForceInventoryUpdate", false); LAZY_CACHE = generalConfig.getBoolean("LazyCache", true); CHECK_HTML_ENCODING = generalConfig.getBoolean("CheckHtmlEncoding", true); CACHE_CHAR_NAMES = generalConfig.getBoolean("CacheCharNames", true); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/CombatFlag.java index e0487f9079..e743f8e5c2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -82,16 +81,10 @@ public class CombatFlag _player.sendPacket(sm); // Refresh inventory - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_item); - _player.sendInventoryUpdate(iu); - } - else - { - _player.sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_item); + _player.sendInventoryUpdate(iu); + // Refresh player stats _player.broadcastUserInfo(); _player.setCombatFlagEquipped(true); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/TradeList.java index 531d70d789..0cb8de3cc5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/TradeList.java @@ -591,31 +591,17 @@ public class TradeList else { // Prepare inventory update packet - final InventoryUpdate ownerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); - final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate ownerIU = new InventoryUpdate(); + final InventoryUpdate partnerIU = new InventoryUpdate(); // Transfer items partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); - // Send inventory update packet - if (ownerIU != null) - { - _owner.sendInventoryUpdate(ownerIU); - } - else - { - _owner.sendItemList(); - } + // Send inventory update packets + _owner.sendInventoryUpdate(ownerIU); + _partner.sendInventoryUpdate(partnerIU); - if (partnerIU != null) - { - _partner.sendInventoryUpdate(partnerIU); - } - else - { - _partner.sendItemList(); - } success = true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java index d58ec615b3..c14854ebcd 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -3012,22 +3012,15 @@ public class Player extends Playable _inventory.addAdena(process, count, this, reference); // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) + if (count == getAdena()) { - if (count == getAdena()) - { - sendItemList(); - } - else - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addModifiedItem(_inventory.getAdenaInstance()); - sendInventoryUpdate(iu); - } + sendItemList(); } else { - sendItemList(); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(_inventory.getAdenaInstance()); + sendInventoryUpdate(iu); } } } @@ -3060,16 +3053,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(adenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(adenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3110,16 +3096,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(beautyTickets); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(beautyTickets); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3162,16 +3141,10 @@ public class Player extends Playable if (count > 0) { _inventory.addAncientAdena(process, count, this, reference); - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_inventory.getAncientAdenaInstance()); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_inventory.getAncientAdenaInstance()); + sendInventoryUpdate(iu); } } @@ -3202,16 +3175,9 @@ public class Player extends Playable return false; } - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(ancientAdenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(ancientAdenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3418,23 +3384,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) - { - playerIU.addModifiedItem(destoyedItem); - } - else - { - playerIU.addRemovedItem(destoyedItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(destoyedItem); } else { - sendItemList(); + playerIU.addRemovedItem(destoyedItem); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3534,23 +3493,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > 0)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addRemovedItem(item); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - sendItemList(); + playerIU.addRemovedItem(item); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3596,45 +3548,31 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(oldItem); } else { - sendItemList(); + playerIU.addRemovedItem(oldItem); } + sendInventoryUpdate(playerIU); // Send target update packet if (target instanceof PlayerInventory) { final Player targetPlayer = ((PlayerInventory) target).getOwner(); - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate targetIU = new InventoryUpdate(); + if (newItem.getCount() > count) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (newItem.getCount() > count) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } - targetPlayer.sendPacket(playerIU); + targetIU.addModifiedItem(newItem); } else { - targetPlayer.sendItemList(); + targetIU.addNewItem(newItem); } + targetPlayer.sendPacket(targetIU); } return newItem; } @@ -3723,16 +3661,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(droppedItem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(droppedItem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3797,16 +3728,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(invitem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(invitem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index b5de8b0e2c..c11ae1861c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -441,16 +441,9 @@ public class PlayerInventory extends Inventory if (actor != null) { // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(addedItem); - actor.sendInventoryUpdate(playerIU); - } - else - { - actor.sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(addedItem); + actor.sendInventoryUpdate(playerIU); // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getTemplate()); @@ -515,23 +508,16 @@ public class PlayerInventory extends Inventory // Send inventory update packet if (update) { - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > count)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > count)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addNewItem(item); - } - actor.sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - actor.sendItemList(); + playerIU.addNewItem(item); } + actor.sendInventoryUpdate(playerIU); } // Notify to scripts @@ -1216,14 +1202,7 @@ public class PlayerInventory extends Inventory } finally { - if (Config.FORCE_INVENTORY_UPDATE) - { - _owner.sendItemList(); - } - else - { - _owner.sendInventoryUpdate(iu); - } + _owner.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 1d6a4dc9bf..09ec930191 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -161,7 +161,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -176,17 +176,15 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); } + else + { + playerIU.addNewItem(newItem); + } + final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); sm.addItemName(item.getId()); sm.addLong(count); @@ -196,10 +194,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket msg.removeAttachments(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 7e05426603..41154e77ac 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -207,22 +207,15 @@ public class RequestDestroyItem implements IClientIncomingPacket return; } - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate iu = new InventoryUpdate(); + if (removedItem.getCount() == 0) { - final InventoryUpdate iu = new InventoryUpdate(); - if (removedItem.getCount() == 0) - { - iu.addRemovedItem(removedItem); - } - else - { - iu.addModifiedItem(removedItem); - } - player.sendInventoryUpdate(iu); + iu.addRemovedItem(removedItem); } else { - player.sendItemList(); + iu.addModifiedItem(removedItem); } + player.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 189197b44f..371bc52d9d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -403,7 +403,7 @@ public class RequestEnchantItem implements IClientIncomingPacket player.sendPacket(sm); } - if (!Config.FORCE_INVENTORY_UPDATE && (crystals != null)) + if (crystals != null) { iu.addItem(crystals); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 62b2ef4c5a..6b247a4044 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -163,7 +163,7 @@ public class RequestPackageSend implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder i : _items) { // Check validity of requested item @@ -182,16 +182,13 @@ public class RequestPackageSend implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } // Remove item objects from the world. @@ -202,13 +199,6 @@ public class RequestPackageSend implements IClientIncomingPacket warehouse.deleteMe(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index e2bf417fa1..a64b93a4bf 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -184,7 +184,7 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -205,16 +205,13 @@ public class RequestPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); + } + else + { + playerIU.addNewItem(newItem); } final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); @@ -224,10 +221,8 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 9f217064bb..eb47cc8375 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -310,7 +310,7 @@ public class RequestSendPost implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (AttachmentItem i : _items) { // Check validity of requested item @@ -328,28 +328,19 @@ public class RequestSendPost implements IClientIncomingPacket continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); - if (playerIU != null) + + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 1c02a4a421..8e354c0c64 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -168,7 +168,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder itemHolder : _items) { // Check validity of requested item @@ -191,27 +191,17 @@ public class SendWareHouseDepositList implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/config/General.ini b/L2J_Mobius_Classic_Interlude/dist/game/config/General.ini index 1ac051ef1e..8d8c07be3d 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/config/General.ini +++ b/L2J_Mobius_Classic_Interlude/dist/game/config/General.ini @@ -238,12 +238,6 @@ StoryQuestRewardBuff = True # Default: True MultipleItemDrop = True -# Forces full item inventory packet to be sent for any item change. -# Notes: -# This can increase network traffic -# Default: False -ForceInventoryUpdate = False - # True = Load html's into cache only on first time html is requested. # False = Load all html's into cache on server startup. # Default: False diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/Config.java index ae9526d38c..8154688052 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/Config.java @@ -498,7 +498,6 @@ public class Config public static boolean AUTODELETE_INVALID_QUEST_DATA; public static boolean ENABLE_STORY_QUEST_BUFF_REWARD; public static boolean MULTIPLE_ITEM_DROP; - public static boolean FORCE_INVENTORY_UPDATE; public static boolean LAZY_CACHE; public static boolean CHECK_HTML_ENCODING; public static boolean CACHE_CHAR_NAMES; @@ -1964,7 +1963,6 @@ public class Config AUTODELETE_INVALID_QUEST_DATA = generalConfig.getBoolean("AutoDeleteInvalidQuestData", false); ENABLE_STORY_QUEST_BUFF_REWARD = generalConfig.getBoolean("StoryQuestRewardBuff", true); MULTIPLE_ITEM_DROP = generalConfig.getBoolean("MultipleItemDrop", true); - FORCE_INVENTORY_UPDATE = generalConfig.getBoolean("ForceInventoryUpdate", false); LAZY_CACHE = generalConfig.getBoolean("LazyCache", true); CHECK_HTML_ENCODING = generalConfig.getBoolean("CheckHtmlEncoding", true); CACHE_CHAR_NAMES = generalConfig.getBoolean("CacheCharNames", true); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/CombatFlag.java index 7385a9fc13..5cd007f840 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -84,16 +83,10 @@ public class CombatFlag _player.sendPacket(sm); // Refresh inventory - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_item); - _player.sendInventoryUpdate(iu); - } - else - { - _player.sendItemList(false); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_item); + _player.sendInventoryUpdate(iu); + // Refresh player stats _player.broadcastUserInfo(); _player.setCombatFlagEquipped(true); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java index 6f2dc0bcd2..97554769e1 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java @@ -591,31 +591,17 @@ public class TradeList else { // Prepare inventory update packet - final InventoryUpdate ownerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); - final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate ownerIU = new InventoryUpdate(); + final InventoryUpdate partnerIU = new InventoryUpdate(); // Transfer items partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); // Send inventory update packet - if (ownerIU != null) - { - _owner.sendInventoryUpdate(ownerIU); - } - else - { - _owner.sendItemList(false); - } + _owner.sendInventoryUpdate(ownerIU); + _partner.sendInventoryUpdate(partnerIU); - if (partnerIU != null) - { - _partner.sendInventoryUpdate(partnerIU); - } - else - { - _partner.sendItemList(false); - } success = true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java index f064f2214f..dfd7a3c30c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -3042,22 +3042,15 @@ public class Player extends Playable _inventory.addAdena(process, count, this, reference); // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) + if (count == getAdena()) { - if (count == getAdena()) - { - sendItemList(false); - } - else - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addModifiedItem(_inventory.getAdenaInstance()); - sendInventoryUpdate(iu); - } + sendItemList(false); } else { - sendItemList(false); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(_inventory.getAdenaInstance()); + sendInventoryUpdate(iu); } } } @@ -3090,16 +3083,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(adenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(false); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(adenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3140,16 +3126,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(beautyTickets); - sendInventoryUpdate(iu); - } - else - { - sendItemList(false); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(beautyTickets); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3192,16 +3171,10 @@ public class Player extends Playable if (count > 0) { _inventory.addAncientAdena(process, count, this, reference); - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_inventory.getAncientAdenaInstance()); - sendInventoryUpdate(iu); - } - else - { - sendItemList(false); - } + + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_inventory.getAncientAdenaInstance()); + sendInventoryUpdate(iu); } } @@ -3232,16 +3205,9 @@ public class Player extends Playable return false; } - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(ancientAdenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(false); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(ancientAdenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3448,23 +3414,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) - { - playerIU.addModifiedItem(destoyedItem); - } - else - { - playerIU.addRemovedItem(destoyedItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(destoyedItem); } else { - sendItemList(false); + playerIU.addRemovedItem(destoyedItem); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3564,23 +3523,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > 0)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addRemovedItem(item); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - sendItemList(false); + playerIU.addRemovedItem(item); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3626,45 +3578,31 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(oldItem); } else { - sendItemList(false); + playerIU.addRemovedItem(oldItem); } + sendInventoryUpdate(playerIU); // Send target update packet if (target instanceof PlayerInventory) { final Player targetPlayer = ((PlayerInventory) target).getOwner(); - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate targetIU = new InventoryUpdate(); + if (newItem.getCount() > count) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (newItem.getCount() > count) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } - targetPlayer.sendPacket(playerIU); + targetIU.addModifiedItem(newItem); } else { - targetPlayer.sendItemList(false); + targetIU.addNewItem(newItem); } + targetPlayer.sendPacket(targetIU); } else if (target instanceof PetInventory) { @@ -3767,16 +3705,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(droppedItem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(false); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(droppedItem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3841,16 +3772,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(invitem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(false); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(invitem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 6e1627d024..c5a1ad58f5 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -417,16 +417,9 @@ public class PlayerInventory extends Inventory if (actor != null) { // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(addedItem); - actor.sendInventoryUpdate(playerIU); - } - else - { - actor.sendItemList(false); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(addedItem); + actor.sendInventoryUpdate(playerIU); // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getTemplate()); @@ -483,23 +476,16 @@ public class PlayerInventory extends Inventory // Send inventory update packet if (update) { - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > count)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > count)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addNewItem(item); - } - actor.sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - actor.sendItemList(false); + playerIU.addNewItem(item); } + actor.sendInventoryUpdate(playerIU); } // Notify to scripts @@ -1095,14 +1081,7 @@ public class PlayerInventory extends Inventory } finally { - if (Config.FORCE_INVENTORY_UPDATE) - { - _owner.sendItemList(false); - } - else - { - _owner.sendInventoryUpdate(iu); - } + _owner.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 3954ae70e6..8112d3b2b0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -161,7 +161,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -176,17 +176,15 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); } + else + { + playerIU.addNewItem(newItem); + } + final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); sm.addItemName(item.getId()); sm.addLong(count); @@ -196,10 +194,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket msg.removeAttachments(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(false); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 717ac43807..0cb418fbf3 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -207,22 +207,15 @@ public class RequestDestroyItem implements IClientIncomingPacket return; } - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate iu = new InventoryUpdate(); + if (removedItem.getCount() == 0) { - final InventoryUpdate iu = new InventoryUpdate(); - if (removedItem.getCount() == 0) - { - iu.addRemovedItem(removedItem); - } - else - { - iu.addModifiedItem(removedItem); - } - player.sendInventoryUpdate(iu); + iu.addRemovedItem(removedItem); } else { - player.sendItemList(true); + iu.addModifiedItem(removedItem); } + player.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 88772a4e63..c46b31e28d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -401,7 +401,7 @@ public class RequestEnchantItem implements IClientIncomingPacket player.sendPacket(sm); } - if (!Config.FORCE_INVENTORY_UPDATE && (crystals != null)) + if (crystals != null) { iu.addItem(crystals); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 7570e3e5e2..6b247a4044 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -163,7 +163,7 @@ public class RequestPackageSend implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder i : _items) { // Check validity of requested item @@ -182,16 +182,13 @@ public class RequestPackageSend implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } // Remove item objects from the world. @@ -202,13 +199,6 @@ public class RequestPackageSend implements IClientIncomingPacket warehouse.deleteMe(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(false); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index bd00745002..77341ce68d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -184,7 +184,7 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -205,16 +205,13 @@ public class RequestPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); + } + else + { + playerIU.addNewItem(newItem); } final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); @@ -224,10 +221,8 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(false); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 5014c0b7d0..eb47cc8375 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -310,7 +310,7 @@ public class RequestSendPost implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (AttachmentItem i : _items) { // Check validity of requested item @@ -328,28 +328,19 @@ public class RequestSendPost implements IClientIncomingPacket continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); - if (playerIU != null) + + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(false); - } + player.sendInventoryUpdate(playerIU); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index b332fd9707..8e354c0c64 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -168,7 +168,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder itemHolder : _items) { // Check validity of requested item @@ -191,27 +191,17 @@ public class SendWareHouseDepositList implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(false); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/config/General.ini b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/config/General.ini index 299eecb215..072b9d29b3 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/config/General.ini +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/config/General.ini @@ -238,12 +238,6 @@ StoryQuestRewardBuff = True # Default: True MultipleItemDrop = True -# Forces full item inventory packet to be sent for any item change. -# Notes: -# This can increase network traffic -# Default: False -ForceInventoryUpdate = False - # True = Load html's into cache only on first time html is requested. # False = Load all html's into cache on server startup. # Default: False diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/Config.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/Config.java index 83f1cce57a..8ae9615ae2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/Config.java @@ -499,7 +499,6 @@ public class Config public static boolean AUTODELETE_INVALID_QUEST_DATA; public static boolean ENABLE_STORY_QUEST_BUFF_REWARD; public static boolean MULTIPLE_ITEM_DROP; - public static boolean FORCE_INVENTORY_UPDATE; public static boolean LAZY_CACHE; public static boolean CHECK_HTML_ENCODING; public static boolean CACHE_CHAR_NAMES; @@ -2047,7 +2046,6 @@ public class Config AUTODELETE_INVALID_QUEST_DATA = generalConfig.getBoolean("AutoDeleteInvalidQuestData", false); ENABLE_STORY_QUEST_BUFF_REWARD = generalConfig.getBoolean("StoryQuestRewardBuff", true); MULTIPLE_ITEM_DROP = generalConfig.getBoolean("MultipleItemDrop", true); - FORCE_INVENTORY_UPDATE = generalConfig.getBoolean("ForceInventoryUpdate", false); LAZY_CACHE = generalConfig.getBoolean("LazyCache", true); CHECK_HTML_ENCODING = generalConfig.getBoolean("CheckHtmlEncoding", true); CACHE_CHAR_NAMES = generalConfig.getBoolean("CacheCharNames", true); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/CombatFlag.java index e0487f9079..e743f8e5c2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -82,16 +81,10 @@ public class CombatFlag _player.sendPacket(sm); // Refresh inventory - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_item); - _player.sendInventoryUpdate(iu); - } - else - { - _player.sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_item); + _player.sendInventoryUpdate(iu); + // Refresh player stats _player.broadcastUserInfo(); _player.setCombatFlagEquipped(true); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/TradeList.java index 531d70d789..0cb8de3cc5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/TradeList.java @@ -591,31 +591,17 @@ public class TradeList else { // Prepare inventory update packet - final InventoryUpdate ownerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); - final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate ownerIU = new InventoryUpdate(); + final InventoryUpdate partnerIU = new InventoryUpdate(); // Transfer items partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); - // Send inventory update packet - if (ownerIU != null) - { - _owner.sendInventoryUpdate(ownerIU); - } - else - { - _owner.sendItemList(); - } + // Send inventory update packets + _owner.sendInventoryUpdate(ownerIU); + _partner.sendInventoryUpdate(partnerIU); - if (partnerIU != null) - { - _partner.sendInventoryUpdate(partnerIU); - } - else - { - _partner.sendItemList(); - } success = true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java index 4838f9f439..6ce6aac6a0 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -3074,22 +3074,15 @@ public class Player extends Playable _inventory.addAdena(process, count, this, reference); // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) + if (count == getAdena()) { - if (count == getAdena()) - { - sendItemList(); - } - else - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addModifiedItem(_inventory.getAdenaInstance()); - sendInventoryUpdate(iu); - } + sendItemList(); } else { - sendItemList(); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(_inventory.getAdenaInstance()); + sendInventoryUpdate(iu); } } } @@ -3122,16 +3115,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(adenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(adenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3172,16 +3158,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(beautyTickets); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(beautyTickets); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3224,16 +3203,10 @@ public class Player extends Playable if (count > 0) { _inventory.addAncientAdena(process, count, this, reference); - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_inventory.getAncientAdenaInstance()); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_inventory.getAncientAdenaInstance()); + sendInventoryUpdate(iu); } } @@ -3264,16 +3237,9 @@ public class Player extends Playable return false; } - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(ancientAdenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(ancientAdenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3481,23 +3447,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) - { - playerIU.addModifiedItem(destoyedItem); - } - else - { - playerIU.addRemovedItem(destoyedItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(destoyedItem); } else { - sendItemList(); + playerIU.addRemovedItem(destoyedItem); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3597,23 +3556,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > 0)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addRemovedItem(item); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - sendItemList(); + playerIU.addRemovedItem(item); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3659,45 +3611,31 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(oldItem); } else { - sendItemList(); + playerIU.addRemovedItem(oldItem); } + sendInventoryUpdate(playerIU); // Send target update packet if (target instanceof PlayerInventory) { final Player targetPlayer = ((PlayerInventory) target).getOwner(); - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate targetIU = new InventoryUpdate(); + if (newItem.getCount() > count) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (newItem.getCount() > count) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } - targetPlayer.sendPacket(playerIU); + targetIU.addModifiedItem(newItem); } else { - targetPlayer.sendItemList(); + targetIU.addNewItem(newItem); } + targetPlayer.sendPacket(targetIU); } // LCoin UI update. @@ -3793,16 +3731,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(droppedItem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(droppedItem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3873,16 +3804,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(invitem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(invitem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 7d13501a79..4a7ab494c8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -424,16 +424,9 @@ public class PlayerInventory extends Inventory if (actor != null) { // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(addedItem); - actor.sendInventoryUpdate(playerIU); - } - else - { - actor.sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(addedItem); + actor.sendInventoryUpdate(playerIU); // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getTemplate()); @@ -490,23 +483,16 @@ public class PlayerInventory extends Inventory // Send inventory update packet if (update) { - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > count)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > count)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addNewItem(item); - } - actor.sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - actor.sendItemList(); + playerIU.addNewItem(item); } + actor.sendInventoryUpdate(playerIU); // Adena UI update. if (item.getId() == Inventory.ADENA_ID) @@ -1191,14 +1177,7 @@ public class PlayerInventory extends Inventory } finally { - if (Config.FORCE_INVENTORY_UPDATE) - { - _owner.sendItemList(); - } - else - { - _owner.sendInventoryUpdate(iu); - } + _owner.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 65c978f8d7..564b941551 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -161,7 +161,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -176,17 +176,15 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); } + else + { + playerIU.addNewItem(newItem); + } + final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); sm.addItemName(item.getId()); sm.addLong(count); @@ -196,10 +194,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket msg.removeAttachments(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index e39ece1d98..bedac1793b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -209,23 +209,16 @@ public class RequestDestroyItem implements IClientIncomingPacket return; } - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate iu = new InventoryUpdate(); + if (removedItem.getCount() == 0) { - final InventoryUpdate iu = new InventoryUpdate(); - if (removedItem.getCount() == 0) - { - iu.addRemovedItem(removedItem); - } - else - { - iu.addModifiedItem(removedItem); - } - player.sendInventoryUpdate(iu); + iu.addRemovedItem(removedItem); } else { - player.sendItemList(); + iu.addModifiedItem(removedItem); } + player.sendInventoryUpdate(iu); // LCoin UI update. if (removedItem.getId() == Inventory.LCOIN_ID) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 5e0f3b078c..b5885a2205 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -408,7 +408,7 @@ public class RequestEnchantItem implements IClientIncomingPacket player.sendPacket(sm); } - if (!Config.FORCE_INVENTORY_UPDATE && (crystals != null)) + if (crystals != null) { iu.addItem(crystals); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 8dae89d3bf..292b1b20a2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -156,7 +156,7 @@ public class RequestPackageSend implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder i : _items) { // Check validity of requested item @@ -175,16 +175,13 @@ public class RequestPackageSend implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } // Remove item objects from the world. @@ -195,13 +192,6 @@ public class RequestPackageSend implements IClientIncomingPacket warehouse.deleteMe(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index ed3bd5e319..4251914308 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -184,7 +184,7 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -205,16 +205,13 @@ public class RequestPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); + } + else + { + playerIU.addNewItem(newItem); } final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S2_S1); @@ -224,10 +221,8 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 3582b308eb..58cf805178 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -310,7 +310,7 @@ public class RequestSendPost implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (AttachmentItem i : _items) { // Check validity of requested item @@ -328,28 +328,19 @@ public class RequestSendPost implements IClientIncomingPacket continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); - if (playerIU != null) + + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 1c02a4a421..8e354c0c64 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -168,7 +168,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder itemHolder : _items) { // Check validity of requested item @@ -191,27 +191,17 @@ public class SendWareHouseDepositList implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/config/General.ini b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/config/General.ini index cf5b611bf1..3ce63e3f85 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/config/General.ini +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/config/General.ini @@ -238,12 +238,6 @@ StoryQuestRewardBuff = True # Default: True MultipleItemDrop = True -# Forces full item inventory packet to be sent for any item change. -# Notes: -# This can increase network traffic -# Default: False -ForceInventoryUpdate = False - # True = Load html's into cache only on first time html is requested. # False = Load all html's into cache on server startup. # Default: False diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/Config.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/Config.java index f6a014c38a..3226b52364 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/Config.java @@ -501,7 +501,6 @@ public class Config public static boolean AUTODELETE_INVALID_QUEST_DATA; public static boolean ENABLE_STORY_QUEST_BUFF_REWARD; public static boolean MULTIPLE_ITEM_DROP; - public static boolean FORCE_INVENTORY_UPDATE; public static boolean LAZY_CACHE; public static boolean CHECK_HTML_ENCODING; public static boolean CACHE_CHAR_NAMES; @@ -2146,7 +2145,6 @@ public class Config AUTODELETE_INVALID_QUEST_DATA = generalConfig.getBoolean("AutoDeleteInvalidQuestData", false); ENABLE_STORY_QUEST_BUFF_REWARD = generalConfig.getBoolean("StoryQuestRewardBuff", true); MULTIPLE_ITEM_DROP = generalConfig.getBoolean("MultipleItemDrop", true); - FORCE_INVENTORY_UPDATE = generalConfig.getBoolean("ForceInventoryUpdate", false); LAZY_CACHE = generalConfig.getBoolean("LazyCache", true); CHECK_HTML_ENCODING = generalConfig.getBoolean("CheckHtmlEncoding", true); CACHE_CHAR_NAMES = generalConfig.getBoolean("CacheCharNames", true); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/CombatFlag.java index e0487f9079..e743f8e5c2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -82,16 +81,10 @@ public class CombatFlag _player.sendPacket(sm); // Refresh inventory - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_item); - _player.sendInventoryUpdate(iu); - } - else - { - _player.sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_item); + _player.sendInventoryUpdate(iu); + // Refresh player stats _player.broadcastUserInfo(); _player.setCombatFlagEquipped(true); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/TradeList.java index 531d70d789..0cb8de3cc5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/TradeList.java @@ -591,31 +591,17 @@ public class TradeList else { // Prepare inventory update packet - final InventoryUpdate ownerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); - final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate ownerIU = new InventoryUpdate(); + final InventoryUpdate partnerIU = new InventoryUpdate(); // Transfer items partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); - // Send inventory update packet - if (ownerIU != null) - { - _owner.sendInventoryUpdate(ownerIU); - } - else - { - _owner.sendItemList(); - } + // Send inventory update packets + _owner.sendInventoryUpdate(ownerIU); + _partner.sendInventoryUpdate(partnerIU); - if (partnerIU != null) - { - _partner.sendInventoryUpdate(partnerIU); - } - else - { - _partner.sendItemList(); - } success = true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java index b453ef1546..6db8e92128 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -3110,22 +3110,15 @@ public class Player extends Playable _inventory.addAdena(process, count, this, reference); // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) + if (count == getAdena()) { - if (count == getAdena()) - { - sendItemList(); - } - else - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addModifiedItem(_inventory.getAdenaInstance()); - sendInventoryUpdate(iu); - } + sendItemList(); } else { - sendItemList(); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(_inventory.getAdenaInstance()); + sendInventoryUpdate(iu); } } } @@ -3158,16 +3151,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(adenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(adenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3208,16 +3194,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(beautyTickets); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(beautyTickets); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3260,16 +3239,10 @@ public class Player extends Playable if (count > 0) { _inventory.addAncientAdena(process, count, this, reference); - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_inventory.getAncientAdenaInstance()); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_inventory.getAncientAdenaInstance()); + sendInventoryUpdate(iu); } } @@ -3300,16 +3273,9 @@ public class Player extends Playable return false; } - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(ancientAdenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(ancientAdenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3517,23 +3483,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) - { - playerIU.addModifiedItem(destoyedItem); - } - else - { - playerIU.addRemovedItem(destoyedItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(destoyedItem); } else { - sendItemList(); + playerIU.addRemovedItem(destoyedItem); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3633,23 +3592,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > 0)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addRemovedItem(item); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - sendItemList(); + playerIU.addRemovedItem(item); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3695,45 +3647,31 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(oldItem); } else { - sendItemList(); + playerIU.addRemovedItem(oldItem); } + sendInventoryUpdate(playerIU); // Send target update packet if (target instanceof PlayerInventory) { final Player targetPlayer = ((PlayerInventory) target).getOwner(); - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate targetIU = new InventoryUpdate(); + if (newItem.getCount() > count) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (newItem.getCount() > count) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } - targetPlayer.sendPacket(playerIU); + targetIU.addModifiedItem(newItem); } else { - targetPlayer.sendItemList(); + targetIU.addNewItem(newItem); } + targetPlayer.sendPacket(targetIU); } // LCoin UI update. @@ -3829,16 +3767,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(droppedItem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(droppedItem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3909,16 +3840,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(invitem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(invitem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 7d13501a79..4a7ab494c8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -424,16 +424,9 @@ public class PlayerInventory extends Inventory if (actor != null) { // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(addedItem); - actor.sendInventoryUpdate(playerIU); - } - else - { - actor.sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(addedItem); + actor.sendInventoryUpdate(playerIU); // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getTemplate()); @@ -490,23 +483,16 @@ public class PlayerInventory extends Inventory // Send inventory update packet if (update) { - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > count)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > count)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addNewItem(item); - } - actor.sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - actor.sendItemList(); + playerIU.addNewItem(item); } + actor.sendInventoryUpdate(playerIU); // Adena UI update. if (item.getId() == Inventory.ADENA_ID) @@ -1191,14 +1177,7 @@ public class PlayerInventory extends Inventory } finally { - if (Config.FORCE_INVENTORY_UPDATE) - { - _owner.sendItemList(); - } - else - { - _owner.sendInventoryUpdate(iu); - } + _owner.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 005a60fba2..34b382b1c8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -161,7 +161,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -176,17 +176,15 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); } + else + { + playerIU.addNewItem(newItem); + } + final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_X_S2); sm.addItemName(item.getId()); sm.addLong(count); @@ -196,10 +194,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket msg.removeAttachments(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index e39ece1d98..bedac1793b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -209,23 +209,16 @@ public class RequestDestroyItem implements IClientIncomingPacket return; } - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate iu = new InventoryUpdate(); + if (removedItem.getCount() == 0) { - final InventoryUpdate iu = new InventoryUpdate(); - if (removedItem.getCount() == 0) - { - iu.addRemovedItem(removedItem); - } - else - { - iu.addModifiedItem(removedItem); - } - player.sendInventoryUpdate(iu); + iu.addRemovedItem(removedItem); } else { - player.sendItemList(); + iu.addModifiedItem(removedItem); } + player.sendInventoryUpdate(iu); // LCoin UI update. if (removedItem.getId() == Inventory.LCOIN_ID) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index a412020345..9c8bf6e834 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -408,7 +408,7 @@ public class RequestEnchantItem implements IClientIncomingPacket player.sendPacket(sm); } - if (!Config.FORCE_INVENTORY_UPDATE && (crystals != null)) + if (crystals != null) { iu.addItem(crystals); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 8dae89d3bf..292b1b20a2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -156,7 +156,7 @@ public class RequestPackageSend implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder i : _items) { // Check validity of requested item @@ -175,16 +175,13 @@ public class RequestPackageSend implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } // Remove item objects from the world. @@ -195,13 +192,6 @@ public class RequestPackageSend implements IClientIncomingPacket warehouse.deleteMe(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 7b2a3bae94..d6353fe936 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -184,7 +184,7 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -205,16 +205,13 @@ public class RequestPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); + } + else + { + playerIU.addNewItem(newItem); } final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_X_S2); @@ -224,10 +221,8 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 3582b308eb..58cf805178 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -310,7 +310,7 @@ public class RequestSendPost implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (AttachmentItem i : _items) { // Check validity of requested item @@ -328,28 +328,19 @@ public class RequestSendPost implements IClientIncomingPacket continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); - if (playerIU != null) + + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 1c02a4a421..8e354c0c64 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -168,7 +168,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder itemHolder : _items) { // Check validity of requested item @@ -191,27 +191,17 @@ public class SendWareHouseDepositList implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/config/General.ini b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/config/General.ini index cf5b611bf1..3ce63e3f85 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/config/General.ini +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/config/General.ini @@ -238,12 +238,6 @@ StoryQuestRewardBuff = True # Default: True MultipleItemDrop = True -# Forces full item inventory packet to be sent for any item change. -# Notes: -# This can increase network traffic -# Default: False -ForceInventoryUpdate = False - # True = Load html's into cache only on first time html is requested. # False = Load all html's into cache on server startup. # Default: False diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/Config.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/Config.java index aa0328efd8..394a8dbf11 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/Config.java @@ -502,7 +502,6 @@ public class Config public static boolean AUTODELETE_INVALID_QUEST_DATA; public static boolean ENABLE_STORY_QUEST_BUFF_REWARD; public static boolean MULTIPLE_ITEM_DROP; - public static boolean FORCE_INVENTORY_UPDATE; public static boolean LAZY_CACHE; public static boolean CHECK_HTML_ENCODING; public static boolean CACHE_CHAR_NAMES; @@ -2153,7 +2152,6 @@ public class Config AUTODELETE_INVALID_QUEST_DATA = generalConfig.getBoolean("AutoDeleteInvalidQuestData", false); ENABLE_STORY_QUEST_BUFF_REWARD = generalConfig.getBoolean("StoryQuestRewardBuff", true); MULTIPLE_ITEM_DROP = generalConfig.getBoolean("MultipleItemDrop", true); - FORCE_INVENTORY_UPDATE = generalConfig.getBoolean("ForceInventoryUpdate", false); LAZY_CACHE = generalConfig.getBoolean("LazyCache", true); CHECK_HTML_ENCODING = generalConfig.getBoolean("CheckHtmlEncoding", true); CACHE_CHAR_NAMES = generalConfig.getBoolean("CacheCharNames", true); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/CombatFlag.java index 05640e1621..ade3651048 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -82,16 +81,10 @@ public class CombatFlag _player.sendPacket(sm); // Refresh inventory - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_item); - _player.sendInventoryUpdate(iu); - } - else - { - _player.sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_item); + _player.sendInventoryUpdate(iu); + // Refresh player stats _player.broadcastUserInfo(); _player.setCombatFlagEquipped(true); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/TradeList.java index 4e3b886a94..a132fd519a 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/TradeList.java @@ -591,31 +591,17 @@ public class TradeList else { // Prepare inventory update packet - final InventoryUpdate ownerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); - final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate ownerIU = new InventoryUpdate(); + final InventoryUpdate partnerIU = new InventoryUpdate(); // Transfer items partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); - // Send inventory update packet - if (ownerIU != null) - { - _owner.sendInventoryUpdate(ownerIU); - } - else - { - _owner.sendItemList(); - } + // Send inventory update packets + _owner.sendInventoryUpdate(ownerIU); + _partner.sendInventoryUpdate(partnerIU); - if (partnerIU != null) - { - _partner.sendInventoryUpdate(partnerIU); - } - else - { - _partner.sendItemList(); - } success = true; } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java index 02cd1b02fc..ad30b15cac 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -3125,22 +3125,15 @@ public class Player extends Playable _inventory.addAdena(process, count, this, reference); // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) + if (count == getAdena()) { - if (count == getAdena()) - { - sendItemList(); - } - else - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addModifiedItem(_inventory.getAdenaInstance()); - sendInventoryUpdate(iu); - } + sendItemList(); } else { - sendItemList(); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(_inventory.getAdenaInstance()); + sendInventoryUpdate(iu); } } } @@ -3173,16 +3166,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(adenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(adenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3223,16 +3209,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(beautyTickets); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(beautyTickets); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3275,16 +3254,10 @@ public class Player extends Playable if (count > 0) { _inventory.addAncientAdena(process, count, this, reference); - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_inventory.getAncientAdenaInstance()); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_inventory.getAncientAdenaInstance()); + sendInventoryUpdate(iu); } } @@ -3315,16 +3288,9 @@ public class Player extends Playable return false; } - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(ancientAdenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(ancientAdenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3532,23 +3498,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) - { - playerIU.addModifiedItem(destoyedItem); - } - else - { - playerIU.addRemovedItem(destoyedItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(destoyedItem); } else { - sendItemList(); + playerIU.addRemovedItem(destoyedItem); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3648,23 +3607,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > 0)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addRemovedItem(item); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - sendItemList(); + playerIU.addRemovedItem(item); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3710,45 +3662,31 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(oldItem); } else { - sendItemList(); + playerIU.addRemovedItem(oldItem); } + sendInventoryUpdate(playerIU); // Send target update packet if (target instanceof PlayerInventory) { final Player targetPlayer = ((PlayerInventory) target).getOwner(); - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate targetIU = new InventoryUpdate(); + if (newItem.getCount() > count) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (newItem.getCount() > count) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } - targetPlayer.sendPacket(playerIU); + targetIU.addModifiedItem(newItem); } else { - targetPlayer.sendItemList(); + targetIU.addNewItem(newItem); } + targetPlayer.sendPacket(targetIU); } // LCoin UI update. @@ -3844,16 +3782,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(droppedItem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(droppedItem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3924,16 +3855,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(invitem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(invitem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 7d13501a79..4a7ab494c8 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -424,16 +424,9 @@ public class PlayerInventory extends Inventory if (actor != null) { // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(addedItem); - actor.sendInventoryUpdate(playerIU); - } - else - { - actor.sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(addedItem); + actor.sendInventoryUpdate(playerIU); // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getTemplate()); @@ -490,23 +483,16 @@ public class PlayerInventory extends Inventory // Send inventory update packet if (update) { - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > count)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > count)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addNewItem(item); - } - actor.sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - actor.sendItemList(); + playerIU.addNewItem(item); } + actor.sendInventoryUpdate(playerIU); // Adena UI update. if (item.getId() == Inventory.ADENA_ID) @@ -1191,14 +1177,7 @@ public class PlayerInventory extends Inventory } finally { - if (Config.FORCE_INVENTORY_UPDATE) - { - _owner.sendItemList(); - } - else - { - _owner.sendInventoryUpdate(iu); - } + _owner.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 42a9f075c3..b5b0aac3f6 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -161,7 +161,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -176,17 +176,15 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); } + else + { + playerIU.addNewItem(newItem); + } + final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_X_S2); sm.addItemName(item.getId()); sm.addLong(count); @@ -196,10 +194,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket msg.removeAttachments(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 5d563c5076..3f84a03473 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -209,23 +209,16 @@ public class RequestDestroyItem implements IClientIncomingPacket return; } - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate iu = new InventoryUpdate(); + if (removedItem.getCount() == 0) { - final InventoryUpdate iu = new InventoryUpdate(); - if (removedItem.getCount() == 0) - { - iu.addRemovedItem(removedItem); - } - else - { - iu.addModifiedItem(removedItem); - } - player.sendInventoryUpdate(iu); + iu.addRemovedItem(removedItem); } else { - player.sendItemList(); + iu.addModifiedItem(removedItem); } + player.sendInventoryUpdate(iu); // LCoin UI update. if (removedItem.getId() == Inventory.LCOIN_ID) diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 58f01890be..796eb47107 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -408,7 +408,7 @@ public class RequestEnchantItem implements IClientIncomingPacket player.sendPacket(sm); } - if (!Config.FORCE_INVENTORY_UPDATE && (crystals != null)) + if (crystals != null) { iu.addItem(crystals); } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index aef8ae680f..dd02ade181 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -156,7 +156,7 @@ public class RequestPackageSend implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder i : _items) { // Check validity of requested item @@ -175,16 +175,13 @@ public class RequestPackageSend implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } // Remove item objects from the world. @@ -195,13 +192,6 @@ public class RequestPackageSend implements IClientIncomingPacket warehouse.deleteMe(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 7b2a3bae94..d6353fe936 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -184,7 +184,7 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -205,16 +205,13 @@ public class RequestPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); + } + else + { + playerIU.addNewItem(newItem); } final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_X_S2); @@ -224,10 +221,8 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 3582b308eb..58cf805178 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -310,7 +310,7 @@ public class RequestSendPost implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (AttachmentItem i : _items) { // Check validity of requested item @@ -328,28 +328,19 @@ public class RequestSendPost implements IClientIncomingPacket continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); - if (playerIU != null) + + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); return true; } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index e64b7c89a8..fe15c9d1b6 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -168,7 +168,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder itemHolder : _items) { // Check validity of requested item @@ -191,27 +191,17 @@ public class SendWareHouseDepositList implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/config/General.ini b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/config/General.ini index cf5b611bf1..3ce63e3f85 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/config/General.ini +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/config/General.ini @@ -238,12 +238,6 @@ StoryQuestRewardBuff = True # Default: True MultipleItemDrop = True -# Forces full item inventory packet to be sent for any item change. -# Notes: -# This can increase network traffic -# Default: False -ForceInventoryUpdate = False - # True = Load html's into cache only on first time html is requested. # False = Load all html's into cache on server startup. # Default: False diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/Config.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/Config.java index a62f2c77c3..a160f98b90 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/Config.java @@ -502,7 +502,6 @@ public class Config public static boolean AUTODELETE_INVALID_QUEST_DATA; public static boolean ENABLE_STORY_QUEST_BUFF_REWARD; public static boolean MULTIPLE_ITEM_DROP; - public static boolean FORCE_INVENTORY_UPDATE; public static boolean LAZY_CACHE; public static boolean CHECK_HTML_ENCODING; public static boolean CACHE_CHAR_NAMES; @@ -2153,7 +2152,6 @@ public class Config AUTODELETE_INVALID_QUEST_DATA = generalConfig.getBoolean("AutoDeleteInvalidQuestData", false); ENABLE_STORY_QUEST_BUFF_REWARD = generalConfig.getBoolean("StoryQuestRewardBuff", true); MULTIPLE_ITEM_DROP = generalConfig.getBoolean("MultipleItemDrop", true); - FORCE_INVENTORY_UPDATE = generalConfig.getBoolean("ForceInventoryUpdate", false); LAZY_CACHE = generalConfig.getBoolean("LazyCache", true); CHECK_HTML_ENCODING = generalConfig.getBoolean("CheckHtmlEncoding", true); CACHE_CHAR_NAMES = generalConfig.getBoolean("CacheCharNames", true); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/CombatFlag.java index 05640e1621..ade3651048 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -82,16 +81,10 @@ public class CombatFlag _player.sendPacket(sm); // Refresh inventory - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_item); - _player.sendInventoryUpdate(iu); - } - else - { - _player.sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_item); + _player.sendInventoryUpdate(iu); + // Refresh player stats _player.broadcastUserInfo(); _player.setCombatFlagEquipped(true); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/TradeList.java index 4e3b886a94..a132fd519a 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/TradeList.java @@ -591,31 +591,17 @@ public class TradeList else { // Prepare inventory update packet - final InventoryUpdate ownerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); - final InventoryUpdate partnerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate ownerIU = new InventoryUpdate(); + final InventoryUpdate partnerIU = new InventoryUpdate(); // Transfer items partnerList.TransferItems(_owner, partnerIU, ownerIU); TransferItems(partnerList.getOwner(), ownerIU, partnerIU); - // Send inventory update packet - if (ownerIU != null) - { - _owner.sendInventoryUpdate(ownerIU); - } - else - { - _owner.sendItemList(); - } + // Send inventory update packets + _owner.sendInventoryUpdate(ownerIU); + _partner.sendInventoryUpdate(partnerIU); - if (partnerIU != null) - { - _partner.sendInventoryUpdate(partnerIU); - } - else - { - _partner.sendItemList(); - } success = true; } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java index a9783b5947..48076531b3 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -3134,22 +3134,15 @@ public class Player extends Playable _inventory.addAdena(process, count, this, reference); // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) + if (count == getAdena()) { - if (count == getAdena()) - { - sendItemList(); - } - else - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addModifiedItem(_inventory.getAdenaInstance()); - sendInventoryUpdate(iu); - } + sendItemList(); } else { - sendItemList(); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(_inventory.getAdenaInstance()); + sendInventoryUpdate(iu); } } } @@ -3182,16 +3175,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(adenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(adenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3232,16 +3218,9 @@ public class Player extends Playable } // Send update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(beautyTickets); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(beautyTickets); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3284,16 +3263,10 @@ public class Player extends Playable if (count > 0) { _inventory.addAncientAdena(process, count, this, reference); - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(_inventory.getAncientAdenaInstance()); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(_inventory.getAncientAdenaInstance()); + sendInventoryUpdate(iu); } } @@ -3324,16 +3297,9 @@ public class Player extends Playable return false; } - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate iu = new InventoryUpdate(); - iu.addItem(ancientAdenaItem); - sendInventoryUpdate(iu); - } - else - { - sendItemList(); - } + final InventoryUpdate iu = new InventoryUpdate(); + iu.addItem(ancientAdenaItem); + sendInventoryUpdate(iu); if (sendMessage) { @@ -3569,23 +3535,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (destoyedItem.isStackable() && (destoyedItem.getCount() > 0)) - { - playerIU.addModifiedItem(destoyedItem); - } - else - { - playerIU.addRemovedItem(destoyedItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(destoyedItem); } else { - sendItemList(); + playerIU.addRemovedItem(destoyedItem); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3685,23 +3644,16 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > 0)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > 0)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addRemovedItem(item); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - sendItemList(); + playerIU.addRemovedItem(item); } + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3747,45 +3699,31 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } - sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(oldItem); } else { - sendItemList(); + playerIU.addRemovedItem(oldItem); } + sendInventoryUpdate(playerIU); // Send target update packet if (target instanceof PlayerInventory) { final Player targetPlayer = ((PlayerInventory) target).getOwner(); - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate targetIU = new InventoryUpdate(); + if (newItem.getCount() > count) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (newItem.getCount() > count) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } - targetPlayer.sendPacket(playerIU); + targetIU.addModifiedItem(newItem); } else { - targetPlayer.sendItemList(); + targetIU.addNewItem(newItem); } + targetPlayer.sendPacket(targetIU); } // LCoin UI update. @@ -3881,16 +3819,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(droppedItem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(droppedItem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) @@ -3961,16 +3892,9 @@ public class Player extends Playable } // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(invitem); - sendInventoryUpdate(playerIU); - } - else - { - sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(invitem); + sendInventoryUpdate(playerIU); // Sends message to client if requested if (sendMessage) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 7d13501a79..4a7ab494c8 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -424,16 +424,9 @@ public class PlayerInventory extends Inventory if (actor != null) { // Send inventory update packet - if (!Config.FORCE_INVENTORY_UPDATE) - { - final InventoryUpdate playerIU = new InventoryUpdate(); - playerIU.addItem(addedItem); - actor.sendInventoryUpdate(playerIU); - } - else - { - actor.sendItemList(); - } + final InventoryUpdate playerIU = new InventoryUpdate(); + playerIU.addItem(addedItem); + actor.sendInventoryUpdate(playerIU); // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getTemplate()); @@ -490,23 +483,16 @@ public class PlayerInventory extends Inventory // Send inventory update packet if (update) { - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate playerIU = new InventoryUpdate(); + if (item.isStackable() && (item.getCount() > count)) { - final InventoryUpdate playerIU = new InventoryUpdate(); - if (item.isStackable() && (item.getCount() > count)) - { - playerIU.addModifiedItem(item); - } - else - { - playerIU.addNewItem(item); - } - actor.sendInventoryUpdate(playerIU); + playerIU.addModifiedItem(item); } else { - actor.sendItemList(); + playerIU.addNewItem(item); } + actor.sendInventoryUpdate(playerIU); // Adena UI update. if (item.getId() == Inventory.ADENA_ID) @@ -1191,14 +1177,7 @@ public class PlayerInventory extends Inventory } finally { - if (Config.FORCE_INVENTORY_UPDATE) - { - _owner.sendItemList(); - } - else - { - _owner.sendInventoryUpdate(iu); - } + _owner.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 42a9f075c3..b5b0aac3f6 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -161,7 +161,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -176,17 +176,15 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); } + else + { + playerIU.addNewItem(newItem); + } + final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_X_S2); sm.addItemName(item.getId()); sm.addLong(count); @@ -196,10 +194,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket msg.removeAttachments(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 5d563c5076..3f84a03473 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -209,23 +209,16 @@ public class RequestDestroyItem implements IClientIncomingPacket return; } - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate iu = new InventoryUpdate(); + if (removedItem.getCount() == 0) { - final InventoryUpdate iu = new InventoryUpdate(); - if (removedItem.getCount() == 0) - { - iu.addRemovedItem(removedItem); - } - else - { - iu.addModifiedItem(removedItem); - } - player.sendInventoryUpdate(iu); + iu.addRemovedItem(removedItem); } else { - player.sendItemList(); + iu.addModifiedItem(removedItem); } + player.sendInventoryUpdate(iu); // LCoin UI update. if (removedItem.getId() == Inventory.LCOIN_ID) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index aef8ae680f..dd02ade181 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -156,7 +156,7 @@ public class RequestPackageSend implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder i : _items) { // Check validity of requested item @@ -175,16 +175,13 @@ public class RequestPackageSend implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } // Remove item objects from the world. @@ -195,13 +192,6 @@ public class RequestPackageSend implements IClientIncomingPacket warehouse.deleteMe(); // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 7b2a3bae94..d6353fe936 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -184,7 +184,7 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (Item item : attachments.getItems()) { if (item == null) @@ -205,16 +205,13 @@ public class RequestPostAttachment implements IClientIncomingPacket return; } - if (playerIU != null) + if (newItem.isStackable() && (newItem.getCount() > count)) { - if (newItem.isStackable() && (newItem.getCount() > count)) - { - playerIU.addModifiedItem(newItem); - } - else - { - playerIU.addNewItem(newItem); - } + playerIU.addModifiedItem(newItem); + } + else + { + playerIU.addNewItem(newItem); } final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_X_S2); @@ -224,10 +221,8 @@ public class RequestPostAttachment implements IClientIncomingPacket } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } + player.sendInventoryUpdate(playerIU); + // Send full list to avoid duplicates. player.sendItemList(); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 3582b308eb..58cf805178 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -310,7 +310,7 @@ public class RequestSendPost implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (AttachmentItem i : _items) { // Check validity of requested item @@ -328,28 +328,19 @@ public class RequestSendPost implements IClientIncomingPacket continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); - if (playerIU != null) + + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); return true; } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index e64b7c89a8..fe15c9d1b6 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -168,7 +168,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket } // Proceed to the transfer - final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate(); + final InventoryUpdate playerIU = new InventoryUpdate(); for (ItemHolder itemHolder : _items) { // Check validity of requested item @@ -191,27 +191,17 @@ public class SendWareHouseDepositList implements IClientIncomingPacket continue; } - if (playerIU != null) + if ((oldItem.getCount() > 0) && (oldItem != newItem)) { - if ((oldItem.getCount() > 0) && (oldItem != newItem)) - { - playerIU.addModifiedItem(oldItem); - } - else - { - playerIU.addRemovedItem(oldItem); - } + playerIU.addModifiedItem(oldItem); + } + else + { + playerIU.addRemovedItem(oldItem); } } // Send updated item list to the player - if (playerIU != null) - { - player.sendInventoryUpdate(playerIU); - } - else - { - player.sendItemList(); - } + player.sendInventoryUpdate(playerIU); } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java index 0cc814ff40..939c70c8b2 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java @@ -411,7 +411,7 @@ public class RequestEnchantItem implements IClientIncomingPacket player.sendPacket(sm); } - if (!Config.FORCE_INVENTORY_UPDATE && (crystals != null)) + if (crystals != null) { iu.addItem(crystals); } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestMultiEnchantItemList.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestMultiEnchantItemList.java index 794f29ec75..4202283e72 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestMultiEnchantItemList.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/multi/ExRequestMultiEnchantItemList.java @@ -283,7 +283,7 @@ public class ExRequestMultiEnchantItemList implements IClientIncomingPacket _failureReward.put(_failureReward.size() + 1, itemHolder); } - if (!Config.FORCE_INVENTORY_UPDATE && (crystals != null)) + if (crystals != null) { iu.addItem(crystals); }