From 6a3556614afabb7d9ac8b8356feeb238a9f6cf79 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 22 Apr 2021 01:53:19 +0000 Subject: [PATCH] Removal of various conversions to arrays. --- .../admincommandhandlers/AdminMobGroup.java | 3 +- .../bypasshandlers/ItemAuctionLink.java | 3 +- .../handlers/effecthandlers/ConvertItem.java | 9 ++-- .../handlers/effecthandlers/Disarmor.java | 18 ++++--- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../handlers/itemhandlers/Recipes.java | 4 +- .../gameserver/RecipeController.java | 9 +--- .../l2jmobius/gameserver/model/MacroList.java | 3 +- .../gameserver/model/MobGroupTable.java | 5 +- .../l2jmobius/gameserver/model/ShortCuts.java | 5 +- .../l2jmobius/gameserver/model/TradeList.java | 6 +-- .../model/actor/instance/PlayerInstance.java | 50 +++++++++--------- .../l2jmobius/gameserver/model/clan/Clan.java | 21 ++++---- .../model/events/AbstractScript.java | 3 +- .../itemauction/ItemAuctionInstance.java | 4 +- .../model/itemcontainer/Inventory.java | 23 ++++---- .../model/items/instance/ItemInstance.java | 6 +-- .../gameserver/network/GameClient.java | 14 +++-- .../clientpackets/RequestCrystallizeItem.java | 3 +- .../clientpackets/RequestDestroyItem.java | 3 +- .../clientpackets/RequestEnchantItem.java | 4 +- .../RequestPledgePowerGradeList.java | 4 +- .../RequestRecipeShopListSet.java | 8 +-- .../network/clientpackets/RequestRefine.java | 3 +- .../clientpackets/RequestRefineCancel.java | 3 +- .../clientpackets/RequestUnEquipItem.java | 15 +++--- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/CharSelectionInfo.java | 18 +++---- .../serverpackets/ExPledgeRecruitInfo.java | 6 ++- .../serverpackets/PledgePowerGradeList.java | 9 ++-- .../serverpackets/PledgeSkillList.java | 12 +++-- .../serverpackets/PrivateStoreListSell.java | 2 +- .../PrivateStoreManageListBuy.java | 4 +- .../PrivateStoreManageListSell.java | 4 +- .../serverpackets/RecipeBookItemList.java | 16 +++--- .../serverpackets/RecipeShopManageList.java | 15 +++--- .../network/serverpackets/ShortCutInit.java | 6 ++- .../ExChangeAttributeItemList.java | 10 ++-- .../admincommandhandlers/AdminMobGroup.java | 3 +- .../bypasshandlers/ItemAuctionLink.java | 3 +- .../handlers/effecthandlers/ConvertItem.java | 9 ++-- .../handlers/effecthandlers/Disarmor.java | 18 ++++--- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../handlers/itemhandlers/Recipes.java | 4 +- .../gameserver/RecipeController.java | 9 +--- .../l2jmobius/gameserver/model/MacroList.java | 3 +- .../gameserver/model/MobGroupTable.java | 5 +- .../l2jmobius/gameserver/model/ShortCuts.java | 5 +- .../l2jmobius/gameserver/model/TradeList.java | 6 +-- .../model/actor/instance/PlayerInstance.java | 50 +++++++++--------- .../l2jmobius/gameserver/model/clan/Clan.java | 21 ++++---- .../model/events/AbstractScript.java | 3 +- .../itemauction/ItemAuctionInstance.java | 4 +- .../model/itemcontainer/Inventory.java | 23 ++++---- .../model/items/instance/ItemInstance.java | 6 +-- .../gameserver/network/GameClient.java | 14 +++-- .../clientpackets/RequestCrystallizeItem.java | 3 +- .../clientpackets/RequestDestroyItem.java | 3 +- .../clientpackets/RequestEnchantItem.java | 4 +- .../RequestPledgePowerGradeList.java | 4 +- .../RequestRecipeShopListSet.java | 8 +-- .../network/clientpackets/RequestRefine.java | 3 +- .../clientpackets/RequestRefineCancel.java | 3 +- .../clientpackets/RequestUnEquipItem.java | 15 +++--- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/CharSelectionInfo.java | 18 +++---- .../serverpackets/ExPledgeRecruitInfo.java | 6 ++- .../serverpackets/PledgePowerGradeList.java | 9 ++-- .../serverpackets/PledgeSkillList.java | 12 +++-- .../serverpackets/PrivateStoreListSell.java | 2 +- .../PrivateStoreManageListBuy.java | 4 +- .../PrivateStoreManageListSell.java | 4 +- .../serverpackets/RecipeBookItemList.java | 16 +++--- .../serverpackets/RecipeShopManageList.java | 15 +++--- .../network/serverpackets/ShortCutInit.java | 6 ++- .../ExChangeAttributeItemList.java | 10 ++-- .../admincommandhandlers/AdminMobGroup.java | 3 +- .../bypasshandlers/ItemAuctionLink.java | 3 +- .../handlers/effecthandlers/ConvertItem.java | 9 ++-- .../handlers/effecthandlers/Disarmor.java | 18 ++++--- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../handlers/itemhandlers/Recipes.java | 4 +- .../gameserver/RecipeController.java | 9 +--- .../l2jmobius/gameserver/model/MacroList.java | 3 +- .../gameserver/model/MobGroupTable.java | 5 +- .../l2jmobius/gameserver/model/ShortCuts.java | 5 +- .../l2jmobius/gameserver/model/TradeList.java | 6 +-- .../model/actor/instance/PlayerInstance.java | 50 +++++++++--------- .../l2jmobius/gameserver/model/clan/Clan.java | 21 ++++---- .../model/events/AbstractScript.java | 3 +- .../itemauction/ItemAuctionInstance.java | 4 +- .../model/itemcontainer/Inventory.java | 23 ++++---- .../model/items/instance/ItemInstance.java | 6 +-- .../gameserver/network/GameClient.java | 14 +++-- .../clientpackets/RequestCrystallizeItem.java | 3 +- .../clientpackets/RequestDestroyItem.java | 3 +- .../clientpackets/RequestEnchantItem.java | 4 +- .../RequestPledgePowerGradeList.java | 4 +- .../RequestRecipeShopListSet.java | 8 +-- .../network/clientpackets/RequestRefine.java | 3 +- .../clientpackets/RequestRefineCancel.java | 3 +- .../clientpackets/RequestUnEquipItem.java | 15 +++--- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/CharSelectionInfo.java | 18 +++---- .../serverpackets/ExPledgeRecruitInfo.java | 6 ++- .../serverpackets/PledgePowerGradeList.java | 9 ++-- .../serverpackets/PledgeSkillList.java | 12 +++-- .../serverpackets/PrivateStoreListSell.java | 2 +- .../PrivateStoreManageListBuy.java | 4 +- .../PrivateStoreManageListSell.java | 4 +- .../serverpackets/RecipeBookItemList.java | 16 +++--- .../serverpackets/RecipeShopManageList.java | 15 +++--- .../network/serverpackets/ShortCutInit.java | 6 ++- .../ExChangeAttributeItemList.java | 10 ++-- .../admincommandhandlers/AdminMobGroup.java | 3 +- .../bypasshandlers/ItemAuctionLink.java | 3 +- .../handlers/effecthandlers/ConvertItem.java | 9 ++-- .../handlers/effecthandlers/Disarmor.java | 18 ++++--- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../l2jmobius/gameserver/model/MacroList.java | 3 +- .../gameserver/model/MobGroupTable.java | 5 +- .../l2jmobius/gameserver/model/ShortCuts.java | 5 +- .../l2jmobius/gameserver/model/TradeList.java | 6 +-- .../model/actor/instance/PlayerInstance.java | 38 +++++++------- .../l2jmobius/gameserver/model/clan/Clan.java | 21 ++++---- .../model/events/AbstractScript.java | 3 +- .../itemauction/ItemAuctionInstance.java | 4 +- .../model/itemcontainer/Inventory.java | 23 ++++---- .../model/items/instance/ItemInstance.java | 6 +-- .../gameserver/network/GameClient.java | 14 +++-- .../clientpackets/RequestCrystallizeItem.java | 3 +- .../clientpackets/RequestDestroyItem.java | 3 +- .../clientpackets/RequestEnchantItem.java | 4 +- .../RequestPledgePowerGradeList.java | 4 +- .../network/clientpackets/RequestRefine.java | 3 +- .../clientpackets/RequestRefineCancel.java | 3 +- .../clientpackets/RequestUnEquipItem.java | 15 +++--- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/CharSelectionInfo.java | 18 +++---- .../serverpackets/ExPledgeRecruitInfo.java | 6 ++- .../serverpackets/PledgePowerGradeList.java | 9 ++-- .../serverpackets/PledgeSkillList.java | 12 +++-- .../serverpackets/PrivateStoreListSell.java | 2 +- .../PrivateStoreManageListBuy.java | 4 +- .../PrivateStoreManageListSell.java | 4 +- .../network/serverpackets/ShortCutInit.java | 6 ++- .../ExChangeAttributeItemList.java | 10 ++-- .../admincommandhandlers/AdminMobGroup.java | 3 +- .../bypasshandlers/ItemAuctionLink.java | 3 +- .../handlers/effecthandlers/ConvertItem.java | 9 ++-- .../handlers/effecthandlers/Disarmor.java | 18 ++++--- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../l2jmobius/gameserver/model/MacroList.java | 3 +- .../gameserver/model/MobGroupTable.java | 5 +- .../l2jmobius/gameserver/model/ShortCuts.java | 5 +- .../l2jmobius/gameserver/model/TradeList.java | 6 +-- .../model/actor/instance/PlayerInstance.java | 38 +++++++------- .../l2jmobius/gameserver/model/clan/Clan.java | 16 +++--- .../model/events/AbstractScript.java | 3 +- .../itemauction/ItemAuctionInstance.java | 4 +- .../model/itemcontainer/Inventory.java | 23 ++++---- .../model/items/instance/ItemInstance.java | 6 +-- .../gameserver/network/GameClient.java | 14 +++-- .../clientpackets/RequestCrystallizeItem.java | 3 +- .../clientpackets/RequestDestroyItem.java | 3 +- .../clientpackets/RequestEnchantItem.java | 4 +- .../RequestPledgePowerGradeList.java | 4 +- .../network/clientpackets/RequestRefine.java | 3 +- .../clientpackets/RequestRefineCancel.java | 3 +- .../clientpackets/RequestUnEquipItem.java | 15 +++--- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/CharSelectionInfo.java | 18 +++---- .../serverpackets/ExPledgeRecruitInfo.java | 6 ++- .../serverpackets/PledgePowerGradeList.java | 9 ++-- .../serverpackets/PledgeSkillList.java | 12 +++-- .../serverpackets/PrivateStoreListSell.java | 2 +- .../PrivateStoreManageListBuy.java | 2 +- .../PrivateStoreManageListSell.java | 2 +- .../network/serverpackets/ShortCutInit.java | 6 ++- .../ExChangeAttributeItemList.java | 10 ++-- .../admincommandhandlers/AdminMobGroup.java | 3 +- .../bypasshandlers/ItemAuctionLink.java | 3 +- .../handlers/effecthandlers/ConvertItem.java | 9 ++-- .../handlers/effecthandlers/Disarmor.java | 18 ++++--- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../l2jmobius/gameserver/model/MacroList.java | 3 +- .../gameserver/model/MobGroupTable.java | 5 +- .../l2jmobius/gameserver/model/ShortCuts.java | 5 +- .../l2jmobius/gameserver/model/TradeList.java | 6 +-- .../model/actor/instance/PlayerInstance.java | 38 +++++++------- .../l2jmobius/gameserver/model/clan/Clan.java | 16 +++--- .../model/events/AbstractScript.java | 3 +- .../itemauction/ItemAuctionInstance.java | 4 +- .../model/itemcontainer/Inventory.java | 23 ++++---- .../model/items/instance/ItemInstance.java | 6 +-- .../gameserver/network/GameClient.java | 14 +++-- .../clientpackets/RequestCrystallizeItem.java | 3 +- .../clientpackets/RequestDestroyItem.java | 3 +- .../clientpackets/RequestEnchantItem.java | 4 +- .../RequestPledgePowerGradeList.java | 4 +- .../network/clientpackets/RequestRefine.java | 3 +- .../clientpackets/RequestRefineCancel.java | 3 +- .../clientpackets/RequestUnEquipItem.java | 15 +++--- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/CharSelectionInfo.java | 18 +++---- .../serverpackets/ExPledgeRecruitInfo.java | 6 ++- .../serverpackets/PledgePowerGradeList.java | 9 ++-- .../serverpackets/PledgeSkillList.java | 12 +++-- .../serverpackets/PrivateStoreListSell.java | 2 +- .../PrivateStoreManageListBuy.java | 2 +- .../PrivateStoreManageListSell.java | 2 +- .../network/serverpackets/ShortCutInit.java | 6 ++- .../ExChangeAttributeItemList.java | 10 ++-- .../admincommandhandlers/AdminMobGroup.java | 3 +- .../bypasshandlers/ItemAuctionLink.java | 3 +- .../handlers/effecthandlers/ConvertItem.java | 9 ++-- .../handlers/effecthandlers/Disarmor.java | 18 ++++--- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../l2jmobius/gameserver/model/MacroList.java | 3 +- .../gameserver/model/MobGroupTable.java | 5 +- .../l2jmobius/gameserver/model/ShortCuts.java | 5 +- .../l2jmobius/gameserver/model/TradeList.java | 6 +-- .../model/actor/instance/PlayerInstance.java | 38 +++++++------- .../l2jmobius/gameserver/model/clan/Clan.java | 16 +++--- .../model/events/AbstractScript.java | 3 +- .../itemauction/ItemAuctionInstance.java | 4 +- .../model/itemcontainer/Inventory.java | 23 ++++---- .../model/items/instance/ItemInstance.java | 6 +-- .../gameserver/network/GameClient.java | 14 +++-- .../clientpackets/RequestCrystallizeItem.java | 3 +- .../clientpackets/RequestDestroyItem.java | 3 +- .../clientpackets/RequestEnchantItem.java | 4 +- .../RequestPledgePowerGradeList.java | 4 +- .../network/clientpackets/RequestRefine.java | 3 +- .../clientpackets/RequestRefineCancel.java | 3 +- .../clientpackets/RequestUnEquipItem.java | 15 +++--- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/CharSelectionInfo.java | 18 +++---- .../serverpackets/ExPledgeRecruitInfo.java | 6 ++- .../serverpackets/PledgePowerGradeList.java | 9 ++-- .../serverpackets/PledgeSkillList.java | 12 +++-- .../serverpackets/PrivateStoreListSell.java | 2 +- .../PrivateStoreManageListBuy.java | 2 +- .../PrivateStoreManageListSell.java | 2 +- .../network/serverpackets/ShortCutInit.java | 6 ++- .../ExChangeAttributeItemList.java | 10 ++-- .../admincommandhandlers/AdminMobGroup.java | 3 +- .../bypasshandlers/ItemAuctionLink.java | 3 +- .../handlers/effecthandlers/ConvertItem.java | 9 ++-- .../handlers/effecthandlers/Disarmor.java | 18 ++++--- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../l2jmobius/gameserver/model/MacroList.java | 3 +- .../gameserver/model/MobGroupTable.java | 5 +- .../l2jmobius/gameserver/model/ShortCuts.java | 5 +- .../l2jmobius/gameserver/model/TradeList.java | 6 +-- .../model/actor/instance/PlayerInstance.java | 38 +++++++------- .../l2jmobius/gameserver/model/clan/Clan.java | 16 +++--- .../model/events/AbstractScript.java | 3 +- .../itemauction/ItemAuctionInstance.java | 4 +- .../model/itemcontainer/Inventory.java | 23 ++++---- .../model/items/instance/ItemInstance.java | 6 +-- .../gameserver/network/GameClient.java | 14 +++-- .../clientpackets/RequestCrystallizeItem.java | 3 +- .../clientpackets/RequestDestroyItem.java | 3 +- .../clientpackets/RequestEnchantItem.java | 4 +- .../RequestPledgePowerGradeList.java | 4 +- .../network/clientpackets/RequestRefine.java | 3 +- .../clientpackets/RequestRefineCancel.java | 3 +- .../clientpackets/RequestUnEquipItem.java | 15 +++--- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/CharSelectionInfo.java | 18 +++---- .../serverpackets/ExPledgeRecruitInfo.java | 6 ++- .../serverpackets/PledgePowerGradeList.java | 9 ++-- .../serverpackets/PledgeSkillList.java | 12 +++-- .../serverpackets/PrivateStoreListSell.java | 2 +- .../PrivateStoreManageListBuy.java | 2 +- .../PrivateStoreManageListSell.java | 2 +- .../network/serverpackets/ShortCutInit.java | 6 ++- .../ExChangeAttributeItemList.java | 10 ++-- .../admincommandhandlers/AdminMobGroup.java | 3 +- .../bypasshandlers/ItemAuctionLink.java | 3 +- .../handlers/effecthandlers/ConvertItem.java | 9 ++-- .../handlers/effecthandlers/Disarmor.java | 18 ++++--- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../l2jmobius/gameserver/model/MacroList.java | 3 +- .../gameserver/model/MobGroupTable.java | 5 +- .../l2jmobius/gameserver/model/ShortCuts.java | 5 +- .../l2jmobius/gameserver/model/TradeList.java | 6 +-- .../model/actor/instance/PlayerInstance.java | 38 +++++++------- .../l2jmobius/gameserver/model/clan/Clan.java | 16 +++--- .../model/events/AbstractScript.java | 3 +- .../itemauction/ItemAuctionInstance.java | 4 +- .../model/itemcontainer/Inventory.java | 23 ++++---- .../model/items/instance/ItemInstance.java | 6 +-- .../gameserver/network/GameClient.java | 14 +++-- .../clientpackets/RequestCrystallizeItem.java | 3 +- .../clientpackets/RequestDestroyItem.java | 3 +- .../clientpackets/RequestEnchantItem.java | 4 +- .../RequestPledgePowerGradeList.java | 4 +- .../network/clientpackets/RequestRefine.java | 3 +- .../clientpackets/RequestRefineCancel.java | 3 +- .../clientpackets/RequestUnEquipItem.java | 15 +++--- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/CharSelectionInfo.java | 18 +++---- .../serverpackets/ExPledgeRecruitInfo.java | 6 ++- .../serverpackets/PledgePowerGradeList.java | 9 ++-- .../serverpackets/PledgeSkillList.java | 12 +++-- .../serverpackets/PrivateStoreListSell.java | 2 +- .../PrivateStoreManageListBuy.java | 2 +- .../PrivateStoreManageListSell.java | 2 +- .../network/serverpackets/ShortCutInit.java | 6 ++- .../ExChangeAttributeItemList.java | 10 ++-- .../admincommandhandlers/AdminMobGroup.java | 3 +- .../bypasshandlers/ItemAuctionLink.java | 3 +- .../handlers/effecthandlers/ConvertItem.java | 9 ++-- .../handlers/effecthandlers/Disarmor.java | 18 ++++--- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../l2jmobius/gameserver/model/MacroList.java | 3 +- .../gameserver/model/MobGroupTable.java | 5 +- .../l2jmobius/gameserver/model/ShortCuts.java | 5 +- .../l2jmobius/gameserver/model/TradeList.java | 6 +-- .../model/actor/instance/PlayerInstance.java | 38 +++++++------- .../l2jmobius/gameserver/model/clan/Clan.java | 16 +++--- .../model/events/AbstractScript.java | 3 +- .../itemauction/ItemAuctionInstance.java | 4 +- .../model/itemcontainer/Inventory.java | 23 ++++---- .../model/items/instance/ItemInstance.java | 6 +-- .../gameserver/network/GameClient.java | 14 +++-- .../clientpackets/RequestCrystallizeItem.java | 3 +- .../clientpackets/RequestDestroyItem.java | 3 +- .../clientpackets/RequestEnchantItem.java | 4 +- .../RequestPledgePowerGradeList.java | 4 +- .../network/clientpackets/RequestRefine.java | 3 +- .../clientpackets/RequestRefineCancel.java | 3 +- .../clientpackets/RequestUnEquipItem.java | 15 +++--- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/CharSelectionInfo.java | 18 +++---- .../serverpackets/ExPledgeRecruitInfo.java | 6 ++- .../serverpackets/PledgePowerGradeList.java | 9 ++-- .../serverpackets/PledgeSkillList.java | 12 +++-- .../serverpackets/PrivateStoreListSell.java | 2 +- .../PrivateStoreManageListBuy.java | 2 +- .../PrivateStoreManageListSell.java | 2 +- .../network/serverpackets/ShortCutInit.java | 6 ++- .../ExChangeAttributeItemList.java | 10 ++-- .../game/data/scripts/ai/bosses/Baium.java | 4 +- .../game/data/scripts/ai/bosses/Valakas.java | 3 +- .../data/scripts/ai/others/Monastery.java | 52 +++++++++---------- .../gameserver/RecipeController.java | 9 +--- .../communitybbs/Manager/ClanBBSManager.java | 4 +- .../communitybbs/Manager/TopicBBSManager.java | 2 +- .../gameserver/data/MobGroupTable.java | 5 +- .../gameserver/data/sql/ClanTable.java | 7 +-- .../gameserver/data/sql/NpcTable.java | 12 ++--- .../gameserver/data/sql/SkillTreeTable.java | 47 +++++++---------- .../gameserver/handler/AutoChatHandler.java | 17 +++--- .../AdminFightCalculator.java | 6 +-- .../admincommandhandlers/AdminMammon.java | 21 ++++---- .../admincommandhandlers/AdminMassRecall.java | 9 ++-- .../admincommandhandlers/AdminMenu.java | 3 +- .../admincommandhandlers/AdminMobGroup.java | 4 +- .../admincommandhandlers/AdminSkill.java | 5 +- .../admincommandhandlers/AdminSpawn.java | 17 +++--- .../handler/itemhandlers/Recipes.java | 4 +- .../handler/skillhandlers/Harvest.java | 5 +- .../handler/skillhandlers/Sweep.java | 5 +- .../l2jmobius/gameserver/model/MacroList.java | 20 +++---- .../l2jmobius/gameserver/model/ShortCuts.java | 5 +- .../l2jmobius/gameserver/model/TradeList.java | 8 +-- .../gameserver/model/actor/Attackable.java | 18 +++---- .../actor/instance/FishermanInstance.java | 3 +- .../model/actor/instance/FolkInstance.java | 8 ++- .../model/actor/instance/NpcInstance.java | 6 +-- .../model/actor/instance/PlayerInstance.java | 40 +++++++------- .../actor/instance/SignsPriestInstance.java | 3 +- .../actor/instance/VillageMasterInstance.java | 3 +- .../l2jmobius/gameserver/model/clan/Clan.java | 29 ++++++----- .../gameserver/model/clan/ClanMember.java | 7 ++- .../model/itemcontainer/Inventory.java | 4 +- .../partymatching/PartyMatchRoomList.java | 5 +- .../gameserver/model/quest/Quest.java | 13 ++--- .../gameserver/model/siege/Siege.java | 3 +- .../gameserver/model/spawn/AutoSpawn.java | 35 +++++-------- .../gameserver/network/GameClient.java | 8 ++- .../clientpackets/RequestAquireSkill.java | 12 ++--- .../clientpackets/RequestAquireSkillInfo.java | 12 ++--- .../clientpackets/RequestExEnchantSkill.java | 6 +-- .../RequestExEnchantSkillInfo.java | 3 +- .../clientpackets/RequestMakeMacro.java | 2 +- .../RequestPledgePowerGradeList.java | 4 +- .../clientpackets/RequestUnEquipItem.java | 12 ++--- .../network/serverpackets/AllyInfo.java | 4 +- .../network/serverpackets/BuyList.java | 16 +++--- .../network/serverpackets/CharSelectInfo.java | 19 ++++--- .../serverpackets/GMViewPledgeInfo.java | 7 +-- .../serverpackets/PledgePowerGradeList.java | 8 +-- .../PledgeReceiveMemberInfo.java | 2 +- .../PledgeShowMemberListAll.java | 2 +- .../serverpackets/PledgeSkillList.java | 12 +++-- .../serverpackets/PrivateStoreListBuy.java | 12 ++--- .../serverpackets/PrivateStoreListSell.java | 8 +-- .../PrivateStoreManageListBuy.java | 5 +- .../PrivateStoreManageListSell.java | 4 +- .../serverpackets/RecipeBookItemList.java | 19 +++---- .../serverpackets/RecipeShopManageList.java | 15 +++--- .../network/serverpackets/ShortCutInit.java | 7 +-- .../network/serverpackets/TradeUpdate.java | 6 +-- .../network/serverpackets/WearList.java | 11 ++-- .../game/data/scripts/ai/bosses/Baium.java | 4 +- .../game/data/scripts/ai/bosses/Valakas.java | 3 +- .../data/scripts/ai/others/Monastery.java | 52 +++++++++---------- .../gameserver/RecipeController.java | 9 +--- .../communitybbs/Manager/ClanBBSManager.java | 4 +- .../communitybbs/Manager/TopicBBSManager.java | 2 +- .../gameserver/data/MobGroupTable.java | 5 +- .../gameserver/data/sql/ClanTable.java | 7 +-- .../gameserver/data/sql/NpcTable.java | 12 ++--- .../gameserver/data/sql/SkillTreeTable.java | 47 +++++++---------- .../gameserver/handler/AutoChatHandler.java | 17 +++--- .../AdminFightCalculator.java | 6 +-- .../admincommandhandlers/AdminMammon.java | 21 ++++---- .../admincommandhandlers/AdminMassRecall.java | 9 ++-- .../admincommandhandlers/AdminMenu.java | 3 +- .../admincommandhandlers/AdminMobGroup.java | 4 +- .../admincommandhandlers/AdminSkill.java | 5 +- .../admincommandhandlers/AdminSpawn.java | 17 +++--- .../handler/itemhandlers/Recipes.java | 4 +- .../handler/skillhandlers/Harvest.java | 5 +- .../handler/skillhandlers/Sweep.java | 5 +- .../l2jmobius/gameserver/model/MacroList.java | 20 +++---- .../l2jmobius/gameserver/model/ShortCuts.java | 5 +- .../l2jmobius/gameserver/model/TradeList.java | 8 +-- .../gameserver/model/actor/Attackable.java | 18 +++---- .../actor/instance/FishermanInstance.java | 3 +- .../model/actor/instance/FolkInstance.java | 8 ++- .../model/actor/instance/NpcInstance.java | 6 +-- .../model/actor/instance/PlayerInstance.java | 40 +++++++------- .../actor/instance/SignsPriestInstance.java | 3 +- .../actor/instance/VillageMasterInstance.java | 3 +- .../l2jmobius/gameserver/model/clan/Clan.java | 29 ++++++----- .../gameserver/model/clan/ClanMember.java | 7 ++- .../model/itemcontainer/Inventory.java | 4 +- .../partymatching/PartyMatchRoomList.java | 5 +- .../gameserver/model/quest/Quest.java | 13 ++--- .../gameserver/model/siege/Siege.java | 3 +- .../gameserver/model/spawn/AutoSpawn.java | 35 +++++-------- .../gameserver/network/GameClient.java | 8 ++- .../clientpackets/RequestAquireSkill.java | 12 ++--- .../clientpackets/RequestAquireSkillInfo.java | 12 ++--- .../clientpackets/RequestExEnchantSkill.java | 6 +-- .../RequestExEnchantSkillInfo.java | 3 +- .../clientpackets/RequestMakeMacro.java | 2 +- .../RequestPledgePowerGradeList.java | 4 +- .../clientpackets/RequestUnEquipItem.java | 12 ++--- .../network/serverpackets/AllyInfo.java | 4 +- .../network/serverpackets/BuyList.java | 16 +++--- .../network/serverpackets/CharSelectInfo.java | 19 ++++--- .../serverpackets/GMViewPledgeInfo.java | 7 +-- .../serverpackets/PledgePowerGradeList.java | 8 +-- .../PledgeShowMemberListAll.java | 9 ++-- .../serverpackets/PledgeSkillList.java | 12 +++-- .../serverpackets/PrivateStoreListBuy.java | 12 ++--- .../serverpackets/PrivateStoreListSell.java | 8 +-- .../PrivateStoreManageListBuy.java | 5 +- .../PrivateStoreManageListSell.java | 4 +- .../serverpackets/RecipeBookItemList.java | 19 +++---- .../serverpackets/RecipeShopManageList.java | 15 +++--- .../network/serverpackets/ShortCutInit.java | 7 +-- .../network/serverpackets/TradeUpdate.java | 6 +-- .../network/serverpackets/WearList.java | 11 ++-- .../admincommandhandlers/AdminMobGroup.java | 3 +- .../bypasshandlers/ItemAuctionLink.java | 3 +- .../handlers/bypasshandlers/QuestLink.java | 5 +- .../handlers/effecthandlers/ConvertItem.java | 9 ++-- .../handlers/itemhandlers/Recipes.java | 4 +- .../gameserver/RecipeController.java | 9 +--- .../gameserver/model/AutoSpawnHandler.java | 20 +++---- .../l2jmobius/gameserver/model/MacroList.java | 3 +- .../gameserver/model/MobGroupTable.java | 5 +- .../l2jmobius/gameserver/model/ShortCuts.java | 5 +- .../l2jmobius/gameserver/model/TradeList.java | 4 +- .../model/actor/instance/PlayerInstance.java | 42 ++++++++------- .../model/events/AbstractScript.java | 3 +- .../itemauction/ItemAuctionInstance.java | 4 +- .../model/itemcontainer/Inventory.java | 26 ++++------ .../model/items/instance/ItemInstance.java | 6 +-- .../partymatching/PartyMatchRoomList.java | 5 +- .../gameserver/network/GameClient.java | 14 +++-- .../clientpackets/RequestCrystallizeItem.java | 3 +- .../clientpackets/RequestDestroyItem.java | 3 +- .../clientpackets/RequestDropItem.java | 3 +- .../clientpackets/RequestEnchantItem.java | 4 +- .../RequestRecipeShopListSet.java | 8 +-- .../network/clientpackets/RequestRefine.java | 3 +- .../clientpackets/RequestRefineCancel.java | 3 +- .../clientpackets/RequestUnEquipItem.java | 15 +++--- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/CharSelectionInfo.java | 18 +++---- .../serverpackets/PrivateStoreListSell.java | 2 +- .../PrivateStoreManageListBuy.java | 4 +- .../PrivateStoreManageListSell.java | 4 +- .../serverpackets/RecipeBookItemList.java | 16 +++--- .../serverpackets/RecipeShopManageList.java | 15 +++--- .../network/serverpackets/ShortCutInit.java | 6 ++- .../admincommandhandlers/AdminMobGroup.java | 3 +- .../bypasshandlers/ItemAuctionLink.java | 3 +- .../handlers/bypasshandlers/QuestLink.java | 5 +- .../handlers/effecthandlers/ConvertItem.java | 9 ++-- .../handlers/itemhandlers/Recipes.java | 4 +- .../FinalEmperialTomb/ScarletVanHalisha.java | 3 +- .../gameserver/RecipeController.java | 9 +--- .../gameserver/model/AutoSpawnHandler.java | 20 +++---- .../l2jmobius/gameserver/model/MacroList.java | 3 +- .../gameserver/model/MobGroupTable.java | 5 +- .../l2jmobius/gameserver/model/ShortCuts.java | 5 +- .../l2jmobius/gameserver/model/TradeList.java | 4 +- .../model/actor/instance/PlayerInstance.java | 42 ++++++++------- .../model/events/AbstractScript.java | 3 +- .../itemauction/ItemAuctionInstance.java | 4 +- .../model/itemcontainer/Inventory.java | 26 ++++------ .../model/items/instance/ItemInstance.java | 6 +-- .../partymatching/PartyMatchRoomList.java | 5 +- .../gameserver/network/GameClient.java | 14 +++-- .../clientpackets/RequestCrystallizeItem.java | 3 +- .../clientpackets/RequestDestroyItem.java | 3 +- .../clientpackets/RequestDropItem.java | 3 +- .../clientpackets/RequestEnchantItem.java | 4 +- .../RequestRecipeShopListSet.java | 8 +-- .../network/clientpackets/RequestRefine.java | 3 +- .../clientpackets/RequestRefineCancel.java | 3 +- .../clientpackets/RequestUnEquipItem.java | 15 +++--- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/CharSelectionInfo.java | 18 +++---- .../serverpackets/PrivateStoreListSell.java | 2 +- .../PrivateStoreManageListBuy.java | 4 +- .../PrivateStoreManageListSell.java | 4 +- .../serverpackets/RecipeBookItemList.java | 16 +++--- .../serverpackets/RecipeShopManageList.java | 15 +++--- .../network/serverpackets/ShortCutInit.java | 6 ++- .../admincommandhandlers/AdminMobGroup.java | 3 +- .../bypasshandlers/ItemAuctionLink.java | 3 +- .../handlers/effecthandlers/ConvertItem.java | 9 ++-- .../handlers/effecthandlers/Disarmor.java | 18 ++++--- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../handlers/itemhandlers/Recipes.java | 4 +- .../gameserver/RecipeController.java | 9 +--- .../l2jmobius/gameserver/model/MacroList.java | 3 +- .../gameserver/model/MobGroupTable.java | 5 +- .../l2jmobius/gameserver/model/ShortCuts.java | 5 +- .../l2jmobius/gameserver/model/TradeList.java | 6 +-- .../model/actor/instance/PlayerInstance.java | 50 +++++++++--------- .../l2jmobius/gameserver/model/clan/Clan.java | 34 ++++++++---- .../model/events/AbstractScript.java | 3 +- .../itemauction/ItemAuctionInstance.java | 4 +- .../model/itemcontainer/Inventory.java | 23 ++++---- .../model/items/instance/ItemInstance.java | 6 +-- .../gameserver/network/GameClient.java | 14 +++-- .../clientpackets/RequestCrystallizeItem.java | 3 +- .../clientpackets/RequestDestroyItem.java | 3 +- .../clientpackets/RequestEnchantItem.java | 4 +- .../RequestPledgePowerGradeList.java | 4 +- .../RequestRecipeShopListSet.java | 8 +-- .../network/clientpackets/RequestRefine.java | 3 +- .../clientpackets/RequestRefineCancel.java | 3 +- .../clientpackets/RequestUnEquipItem.java | 15 +++--- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/CharSelectionInfo.java | 18 +++---- .../serverpackets/ExPledgeRecruitInfo.java | 6 ++- .../serverpackets/PledgePowerGradeList.java | 9 ++-- .../serverpackets/PledgeSkillList.java | 12 +++-- .../serverpackets/PrivateStoreListSell.java | 2 +- .../PrivateStoreManageListBuy.java | 4 +- .../PrivateStoreManageListSell.java | 4 +- .../serverpackets/RecipeBookItemList.java | 16 +++--- .../serverpackets/RecipeShopManageList.java | 15 +++--- .../network/serverpackets/ShortCutInit.java | 6 ++- .../ExChangeAttributeItemList.java | 10 ++-- .../admincommandhandlers/AdminMobGroup.java | 3 +- .../bypasshandlers/ItemAuctionLink.java | 3 +- .../handlers/effecthandlers/ConvertItem.java | 9 ++-- .../handlers/effecthandlers/Disarmor.java | 18 ++++--- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../handlers/itemhandlers/Recipes.java | 4 +- .../gameserver/RecipeController.java | 9 +--- .../l2jmobius/gameserver/model/MacroList.java | 3 +- .../gameserver/model/MobGroupTable.java | 5 +- .../l2jmobius/gameserver/model/ShortCuts.java | 5 +- .../l2jmobius/gameserver/model/TradeList.java | 6 +-- .../model/actor/instance/PlayerInstance.java | 50 +++++++++--------- .../l2jmobius/gameserver/model/clan/Clan.java | 34 ++++++++---- .../model/events/AbstractScript.java | 3 +- .../itemauction/ItemAuctionInstance.java | 4 +- .../model/itemcontainer/Inventory.java | 23 ++++---- .../model/items/instance/ItemInstance.java | 6 +-- .../gameserver/network/GameClient.java | 14 +++-- .../clientpackets/RequestCrystallizeItem.java | 3 +- .../clientpackets/RequestDestroyItem.java | 3 +- .../clientpackets/RequestEnchantItem.java | 4 +- .../RequestPledgePowerGradeList.java | 4 +- .../RequestRecipeShopListSet.java | 8 +-- .../network/clientpackets/RequestRefine.java | 3 +- .../clientpackets/RequestRefineCancel.java | 3 +- .../clientpackets/RequestUnEquipItem.java | 15 +++--- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/CharSelectionInfo.java | 18 +++---- .../serverpackets/ExPledgeRecruitInfo.java | 6 ++- .../serverpackets/PledgePowerGradeList.java | 9 ++-- .../serverpackets/PledgeSkillList.java | 12 +++-- .../serverpackets/PrivateStoreListSell.java | 2 +- .../PrivateStoreManageListBuy.java | 4 +- .../PrivateStoreManageListSell.java | 4 +- .../serverpackets/RecipeBookItemList.java | 16 +++--- .../serverpackets/RecipeShopManageList.java | 15 +++--- .../network/serverpackets/ShortCutInit.java | 6 ++- .../ExChangeAttributeItemList.java | 10 ++-- .../admincommandhandlers/AdminMobGroup.java | 3 +- .../bypasshandlers/ItemAuctionLink.java | 3 +- .../handlers/effecthandlers/ConvertItem.java | 9 ++-- .../handlers/effecthandlers/Disarmor.java | 18 ++++--- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../handlers/itemhandlers/Recipes.java | 4 +- .../gameserver/RecipeController.java | 9 +--- .../l2jmobius/gameserver/model/MacroList.java | 3 +- .../gameserver/model/MobGroupTable.java | 5 +- .../l2jmobius/gameserver/model/ShortCuts.java | 5 +- .../l2jmobius/gameserver/model/TradeList.java | 6 +-- .../model/actor/instance/PlayerInstance.java | 50 +++++++++--------- .../l2jmobius/gameserver/model/clan/Clan.java | 34 ++++++++---- .../model/events/AbstractScript.java | 3 +- .../itemauction/ItemAuctionInstance.java | 4 +- .../model/itemcontainer/Inventory.java | 23 ++++---- .../model/items/instance/ItemInstance.java | 6 +-- .../gameserver/network/GameClient.java | 14 +++-- .../clientpackets/RequestCrystallizeItem.java | 3 +- .../clientpackets/RequestDestroyItem.java | 3 +- .../clientpackets/RequestEnchantItem.java | 4 +- .../RequestPledgePowerGradeList.java | 4 +- .../RequestRecipeShopListSet.java | 8 +-- .../network/clientpackets/RequestRefine.java | 3 +- .../clientpackets/RequestRefineCancel.java | 3 +- .../clientpackets/RequestUnEquipItem.java | 15 +++--- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/CharSelectionInfo.java | 18 +++---- .../serverpackets/ExPledgeRecruitInfo.java | 6 ++- .../serverpackets/PledgePowerGradeList.java | 9 ++-- .../serverpackets/PledgeSkillList.java | 12 +++-- .../serverpackets/PrivateStoreListSell.java | 2 +- .../PrivateStoreManageListBuy.java | 2 +- .../PrivateStoreManageListSell.java | 2 +- .../serverpackets/RecipeBookItemList.java | 16 +++--- .../serverpackets/RecipeShopManageList.java | 15 +++--- .../network/serverpackets/ShortCutInit.java | 6 ++- .../ExChangeAttributeItemList.java | 10 ++-- .../admincommandhandlers/AdminMobGroup.java | 3 +- .../bypasshandlers/ItemAuctionLink.java | 3 +- .../handlers/effecthandlers/ConvertItem.java | 9 ++-- .../handlers/effecthandlers/Disarmor.java | 18 ++++--- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../handlers/itemhandlers/Recipes.java | 4 +- .../gameserver/RecipeController.java | 9 +--- .../l2jmobius/gameserver/model/MacroList.java | 3 +- .../gameserver/model/MobGroupTable.java | 5 +- .../l2jmobius/gameserver/model/ShortCuts.java | 5 +- .../l2jmobius/gameserver/model/TradeList.java | 6 +-- .../model/actor/instance/PlayerInstance.java | 50 +++++++++--------- .../l2jmobius/gameserver/model/clan/Clan.java | 34 ++++++++---- .../model/events/AbstractScript.java | 3 +- .../itemauction/ItemAuctionInstance.java | 4 +- .../model/itemcontainer/Inventory.java | 23 ++++---- .../model/items/instance/ItemInstance.java | 6 +-- .../gameserver/network/GameClient.java | 14 +++-- .../clientpackets/RequestCrystallizeItem.java | 3 +- .../clientpackets/RequestDestroyItem.java | 3 +- .../clientpackets/RequestEnchantItem.java | 4 +- .../RequestPledgePowerGradeList.java | 4 +- .../RequestRecipeShopListSet.java | 8 +-- .../network/clientpackets/RequestRefine.java | 3 +- .../clientpackets/RequestRefineCancel.java | 3 +- .../clientpackets/RequestUnEquipItem.java | 15 +++--- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/CharSelectionInfo.java | 18 +++---- .../serverpackets/ExPledgeRecruitInfo.java | 6 ++- .../serverpackets/PledgePowerGradeList.java | 9 ++-- .../serverpackets/PledgeSkillList.java | 12 +++-- .../serverpackets/PrivateStoreListSell.java | 2 +- .../PrivateStoreManageListBuy.java | 2 +- .../PrivateStoreManageListSell.java | 2 +- .../serverpackets/RecipeBookItemList.java | 16 +++--- .../serverpackets/RecipeShopManageList.java | 15 +++--- .../network/serverpackets/ShortCutInit.java | 6 ++- .../ExChangeAttributeItemList.java | 10 ++-- .../admincommandhandlers/AdminMobGroup.java | 3 +- .../bypasshandlers/ItemAuctionLink.java | 3 +- .../handlers/effecthandlers/ConvertItem.java | 9 ++-- .../handlers/effecthandlers/Disarmor.java | 18 ++++--- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../handlers/itemhandlers/Recipes.java | 4 +- .../gameserver/RecipeController.java | 9 +--- .../l2jmobius/gameserver/model/MacroList.java | 3 +- .../gameserver/model/MobGroupTable.java | 5 +- .../l2jmobius/gameserver/model/ShortCuts.java | 5 +- .../l2jmobius/gameserver/model/TradeList.java | 6 +-- .../model/actor/instance/PlayerInstance.java | 50 +++++++++--------- .../l2jmobius/gameserver/model/clan/Clan.java | 34 ++++++++---- .../model/events/AbstractScript.java | 3 +- .../itemauction/ItemAuctionInstance.java | 4 +- .../model/itemcontainer/Inventory.java | 23 ++++---- .../model/items/instance/ItemInstance.java | 6 +-- .../gameserver/network/GameClient.java | 14 +++-- .../clientpackets/RequestCrystallizeItem.java | 3 +- .../clientpackets/RequestDestroyItem.java | 3 +- .../clientpackets/RequestEnchantItem.java | 4 +- .../RequestPledgePowerGradeList.java | 4 +- .../RequestRecipeShopListSet.java | 8 +-- .../network/clientpackets/RequestRefine.java | 3 +- .../clientpackets/RequestRefineCancel.java | 3 +- .../clientpackets/RequestUnEquipItem.java | 15 +++--- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/CharSelectionInfo.java | 18 +++---- .../serverpackets/ExPledgeRecruitInfo.java | 6 ++- .../serverpackets/PledgePowerGradeList.java | 9 ++-- .../serverpackets/PledgeSkillList.java | 12 +++-- .../serverpackets/PrivateStoreListSell.java | 2 +- .../PrivateStoreManageListBuy.java | 2 +- .../PrivateStoreManageListSell.java | 2 +- .../serverpackets/RecipeBookItemList.java | 16 +++--- .../serverpackets/RecipeShopManageList.java | 15 +++--- .../network/serverpackets/ShortCutInit.java | 6 ++- .../ExChangeAttributeItemList.java | 10 ++-- .../admincommandhandlers/AdminMobGroup.java | 3 +- .../bypasshandlers/ItemAuctionLink.java | 3 +- .../handlers/effecthandlers/ConvertItem.java | 9 ++-- .../handlers/effecthandlers/Disarmor.java | 18 ++++--- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../handlers/itemhandlers/Recipes.java | 4 +- .../gameserver/RecipeController.java | 9 +--- .../l2jmobius/gameserver/model/MacroList.java | 3 +- .../gameserver/model/MobGroupTable.java | 5 +- .../l2jmobius/gameserver/model/ShortCuts.java | 5 +- .../l2jmobius/gameserver/model/TradeList.java | 6 +-- .../model/actor/instance/PlayerInstance.java | 50 +++++++++--------- .../l2jmobius/gameserver/model/clan/Clan.java | 34 ++++++++---- .../model/events/AbstractScript.java | 3 +- .../itemauction/ItemAuctionInstance.java | 4 +- .../model/itemcontainer/Inventory.java | 23 ++++---- .../model/items/instance/ItemInstance.java | 6 +-- .../gameserver/network/GameClient.java | 14 +++-- .../clientpackets/RequestCrystallizeItem.java | 3 +- .../clientpackets/RequestDestroyItem.java | 3 +- .../clientpackets/RequestEnchantItem.java | 4 +- .../RequestPledgePowerGradeList.java | 4 +- .../RequestRecipeShopListSet.java | 8 +-- .../network/clientpackets/RequestRefine.java | 3 +- .../clientpackets/RequestRefineCancel.java | 3 +- .../clientpackets/RequestUnEquipItem.java | 15 +++--- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/CharSelectionInfo.java | 18 +++---- .../serverpackets/ExPledgeRecruitInfo.java | 6 ++- .../serverpackets/PledgePowerGradeList.java | 9 ++-- .../serverpackets/PledgeSkillList.java | 12 +++-- .../serverpackets/PrivateStoreListSell.java | 2 +- .../PrivateStoreManageListBuy.java | 2 +- .../PrivateStoreManageListSell.java | 2 +- .../serverpackets/RecipeBookItemList.java | 16 +++--- .../serverpackets/RecipeShopManageList.java | 15 +++--- .../network/serverpackets/ShortCutInit.java | 6 ++- .../ExChangeAttributeItemList.java | 10 ++-- .../admincommandhandlers/AdminMobGroup.java | 3 +- .../bypasshandlers/ItemAuctionLink.java | 3 +- .../handlers/effecthandlers/ConvertItem.java | 9 ++-- .../handlers/effecthandlers/Disarmor.java | 18 ++++--- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../handlers/itemhandlers/Recipes.java | 4 +- .../gameserver/RecipeController.java | 9 +--- .../l2jmobius/gameserver/model/MacroList.java | 3 +- .../gameserver/model/MobGroupTable.java | 5 +- .../l2jmobius/gameserver/model/ShortCuts.java | 5 +- .../l2jmobius/gameserver/model/TradeList.java | 6 +-- .../model/actor/instance/PlayerInstance.java | 50 +++++++++--------- .../l2jmobius/gameserver/model/clan/Clan.java | 34 ++++++++---- .../model/events/AbstractScript.java | 3 +- .../itemauction/ItemAuctionInstance.java | 4 +- .../model/itemcontainer/Inventory.java | 23 ++++---- .../model/items/instance/ItemInstance.java | 6 +-- .../gameserver/network/GameClient.java | 14 +++-- .../clientpackets/RequestCrystallizeItem.java | 3 +- .../clientpackets/RequestDestroyItem.java | 3 +- .../clientpackets/RequestEnchantItem.java | 4 +- .../RequestPledgePowerGradeList.java | 4 +- .../RequestRecipeShopListSet.java | 8 +-- .../network/clientpackets/RequestRefine.java | 3 +- .../clientpackets/RequestRefineCancel.java | 3 +- .../clientpackets/RequestUnEquipItem.java | 15 +++--- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/CharSelectionInfo.java | 18 +++---- .../serverpackets/ExPledgeRecruitInfo.java | 6 ++- .../serverpackets/PledgePowerGradeList.java | 9 ++-- .../serverpackets/PledgeSkillList.java | 12 +++-- .../serverpackets/PrivateStoreListSell.java | 2 +- .../PrivateStoreManageListBuy.java | 4 +- .../PrivateStoreManageListSell.java | 4 +- .../serverpackets/RecipeBookItemList.java | 16 +++--- .../serverpackets/RecipeShopManageList.java | 15 +++--- .../network/serverpackets/ShortCutInit.java | 6 ++- .../ExChangeAttributeItemList.java | 10 ++-- .../admincommandhandlers/AdminMobGroup.java | 3 +- .../bypasshandlers/ItemAuctionLink.java | 3 +- .../handlers/effecthandlers/ConvertItem.java | 9 ++-- .../handlers/effecthandlers/Disarmor.java | 18 ++++--- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../handlers/itemhandlers/Recipes.java | 4 +- .../gameserver/RecipeController.java | 9 +--- .../l2jmobius/gameserver/model/MacroList.java | 3 +- .../gameserver/model/MobGroupTable.java | 5 +- .../l2jmobius/gameserver/model/ShortCuts.java | 5 +- .../l2jmobius/gameserver/model/TradeList.java | 6 +-- .../model/actor/instance/PlayerInstance.java | 50 +++++++++--------- .../l2jmobius/gameserver/model/clan/Clan.java | 34 ++++++++---- .../model/events/AbstractScript.java | 3 +- .../itemauction/ItemAuctionInstance.java | 4 +- .../model/itemcontainer/Inventory.java | 23 ++++---- .../model/items/instance/ItemInstance.java | 6 +-- .../gameserver/network/GameClient.java | 14 +++-- .../clientpackets/RequestCrystallizeItem.java | 3 +- .../clientpackets/RequestDestroyItem.java | 3 +- .../clientpackets/RequestEnchantItem.java | 4 +- .../RequestPledgePowerGradeList.java | 4 +- .../RequestRecipeShopListSet.java | 8 +-- .../network/clientpackets/RequestRefine.java | 3 +- .../clientpackets/RequestRefineCancel.java | 3 +- .../clientpackets/RequestUnEquipItem.java | 15 +++--- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/CharSelectionInfo.java | 18 +++---- .../serverpackets/ExPledgeRecruitInfo.java | 6 ++- .../serverpackets/PledgePowerGradeList.java | 9 ++-- .../serverpackets/PledgeSkillList.java | 12 +++-- .../serverpackets/PrivateStoreListSell.java | 2 +- .../PrivateStoreManageListBuy.java | 2 +- .../PrivateStoreManageListSell.java | 2 +- .../serverpackets/RecipeBookItemList.java | 16 +++--- .../serverpackets/RecipeShopManageList.java | 15 +++--- .../network/serverpackets/ShortCutInit.java | 6 ++- .../ExChangeAttributeItemList.java | 10 ++-- .../admincommandhandlers/AdminMobGroup.java | 3 +- .../bypasshandlers/ItemAuctionLink.java | 3 +- .../handlers/effecthandlers/ConvertItem.java | 9 ++-- .../handlers/effecthandlers/Disarmor.java | 18 ++++--- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../handlers/itemhandlers/Recipes.java | 4 +- .../gameserver/RecipeController.java | 9 +--- .../l2jmobius/gameserver/model/MacroList.java | 3 +- .../gameserver/model/MobGroupTable.java | 5 +- .../l2jmobius/gameserver/model/ShortCuts.java | 5 +- .../l2jmobius/gameserver/model/TradeList.java | 6 +-- .../model/actor/instance/PlayerInstance.java | 50 +++++++++--------- .../l2jmobius/gameserver/model/clan/Clan.java | 34 ++++++++---- .../model/events/AbstractScript.java | 3 +- .../itemauction/ItemAuctionInstance.java | 4 +- .../model/itemcontainer/Inventory.java | 23 ++++---- .../model/items/instance/ItemInstance.java | 6 +-- .../gameserver/network/GameClient.java | 14 +++-- .../clientpackets/RequestCrystallizeItem.java | 3 +- .../clientpackets/RequestDestroyItem.java | 3 +- .../clientpackets/RequestEnchantItem.java | 4 +- .../RequestPledgePowerGradeList.java | 4 +- .../RequestRecipeShopListSet.java | 8 +-- .../network/clientpackets/RequestRefine.java | 3 +- .../clientpackets/RequestRefineCancel.java | 3 +- .../clientpackets/RequestUnEquipItem.java | 15 +++--- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/CharSelectionInfo.java | 18 +++---- .../serverpackets/ExPledgeRecruitInfo.java | 6 ++- .../serverpackets/PledgePowerGradeList.java | 9 ++-- .../serverpackets/PledgeSkillList.java | 12 +++-- .../serverpackets/PrivateStoreListSell.java | 2 +- .../PrivateStoreManageListBuy.java | 2 +- .../PrivateStoreManageListSell.java | 2 +- .../serverpackets/RecipeBookItemList.java | 16 +++--- .../serverpackets/RecipeShopManageList.java | 15 +++--- .../network/serverpackets/ShortCutInit.java | 6 ++- .../ExChangeAttributeItemList.java | 10 ++-- 881 files changed, 3876 insertions(+), 3980 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java index 771c0e3848..a34595ca73 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java @@ -594,9 +594,8 @@ public class AdminMobGroup implements IAdminCommandHandler private void showGroupList(PlayerInstance activeChar) { - final MobGroup[] mobGroupList = MobGroupTable.getInstance().getGroups(); BuilderUtil.sendSysMessage(activeChar, "======= ======="); - for (MobGroup mobGroup : mobGroupList) + for (MobGroup mobGroup : MobGroupTable.getInstance().getGroups()) { activeChar.sendMessage(mobGroup.getGroupId() + ": " + mobGroup.getActiveMobCount() + " alive out of " + mobGroup.getMaxMobCount() + " of NPC ID " + mobGroup.getTemplate().getId() + " (" + mobGroup.getStatus() + ")"); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java index 11c52819e5..636639079c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java @@ -99,9 +99,8 @@ public class ItemAuctionLink implements IBypassHandler } else if ("cancel".equalsIgnoreCase(cmd)) { - final ItemAuction[] auctions = au.getAuctionsByBidder(player.getObjectId()); boolean returned = false; - for (ItemAuction auction : auctions) + for (ItemAuction auction : au.getAuctionsByBidder(player.getObjectId())) { if (auction.cancelBid(player)) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index 7e2471da71..b82ae4a5bd 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -16,6 +16,8 @@ */ package handlers.effecthandlers; +import java.util.List; + import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -84,7 +86,7 @@ public class ConvertItem extends AbstractEffect final int enchantLevel = wpn.getEnchantLevel(); final AttributeHolder elementals = wpn.getAttributes() == null ? null : wpn.getAttackAttribute(); - final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (ItemInstance unequippedItem : unequiped) { @@ -92,10 +94,11 @@ public class ConvertItem extends AbstractEffect } player.sendInventoryUpdate(iu); - if (unequiped.length <= 0) + if (unequiped.isEmpty()) { return; } + byte count = 0; for (ItemInstance unequippedItem : unequiped) { @@ -120,7 +123,7 @@ public class ConvertItem extends AbstractEffect player.sendPacket(sm); } - if (count == unequiped.length) + if (count == unequiped.size()) { return; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index f393955568..5fdd08dd5f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -16,6 +16,7 @@ */ package handlers.effecthandlers; +import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -67,11 +68,11 @@ public class Disarmor extends AbstractEffect } final PlayerInstance player = effected.getActingPlayer(); - final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); - if (unequiped.length > 0) + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); + if (!unequipped.isEmpty()) { final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : unequipped) { iu.addModifiedItem(itm); } @@ -79,20 +80,21 @@ public class Disarmor extends AbstractEffect player.broadcastUserInfo(); SystemMessage sm = null; - if (unequiped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED); - sm.addInt(unequiped[0].getEnchantLevel()); - sm.addItemName(unequiped[0]); + sm.addInt(unequippedItem.getEnchantLevel()); + sm.addItemName(unequippedItem); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); - sm.addItemName(unequiped[0]); + sm.addItemName(unequippedItem); } player.sendPacket(sm); effected.getInventory().blockItemSlot(_slot); - _unequippedItems.put(effected.getObjectId(), unequiped[0].getObjectId()); + _unequippedItems.put(effected.getObjectId(), unequippedItem.getObjectId()); } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index acf5b9108c..9472c1e46b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -81,7 +81,7 @@ public class ChangeAttributeCrystal implements IItemHandler return false; } - player.sendPacket(new ExChangeAttributeItemList(item.getId(), itemList.toArray(new ItemInfo[itemList.size()]))); + player.sendPacket(new ExChangeAttributeItemList(item.getId(), itemList)); return true; } } \ No newline at end of file diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Recipes.java index 9e13e4dc41..72d0129db1 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Recipes.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Recipes.java @@ -72,13 +72,13 @@ public class Recipes implements IItemHandler { canCraft = player.hasDwarvenCraft(); recipeLevel = (rp.getLevel() > player.getDwarvenCraft()); - recipeLimit = (player.getDwarvenRecipeBook().length >= player.getDwarfRecipeLimit()); + recipeLimit = (player.getDwarvenRecipeBook().size() >= player.getDwarfRecipeLimit()); } else { canCraft = player.hasCommonCraft(); recipeLevel = (rp.getLevel() > player.getCommonCraft()); - recipeLimit = (player.getCommonRecipeBook().length >= player.getCommonRecipeLimit()); + recipeLimit = (player.getCommonRecipeBook().size() >= player.getCommonRecipeLimit()); } if (!canCraft) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/RecipeController.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/RecipeController.java index 37d4ea9698..ad0d6f053d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/RecipeController.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/RecipeController.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -89,9 +88,7 @@ public class RecipeController return; } - final List dwarfRecipes = Arrays.asList(manufacturer.getDwarvenRecipeBook()); - final List commonRecipes = Arrays.asList(manufacturer.getCommonRecipeBook()); - if (!dwarfRecipes.contains(recipeList) && !commonRecipes.contains(recipeList)) + if (!manufacturer.getDwarvenRecipeBook().contains(recipeList) && !manufacturer.getCommonRecipeBook().contains(recipeList)) { Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " sent a false recipe id.", Config.DEFAULT_PUNISH); return; @@ -134,9 +131,7 @@ public class RecipeController return; } - final List dwarfRecipes = Arrays.asList(player.getDwarvenRecipeBook()); - final List commonRecipes = Arrays.asList(player.getCommonRecipeBook()); - if (!dwarfRecipes.contains(recipeList) && !commonRecipes.contains(recipeList)) + if (!player.getDwarvenRecipeBook().contains(recipeList) && !player.getCommonRecipeBook().contains(recipeList)) { Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " sent a false recipe id.", Config.DEFAULT_PUNISH); return; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/MacroList.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/MacroList.java index 2411db329d..ead95f13ea 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/MacroList.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/MacroList.java @@ -90,8 +90,7 @@ public class MacroList implements IRestorable deleteMacroFromDb(removed); } - final Shortcut[] allShortCuts = _owner.getAllShortCuts(); - for (Shortcut sc : allShortCuts) + for (Shortcut sc : _owner.getAllShortCuts()) { if ((sc.getId() == id) && (sc.getType() == ShortcutType.MACRO)) { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/MobGroupTable.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/MobGroupTable.java index 244fd07964..e61d726687 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/MobGroupTable.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/MobGroupTable.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.model; +import java.util.Collection; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -67,9 +68,9 @@ public class MobGroupTable return null; } - public MobGroup[] getGroups() + public Collection getGroups() { - return _groupMap.values().toArray(new MobGroup[_groupMap.size()]); + return _groupMap.values(); } public boolean removeGroup(int groupKey) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/ShortCuts.java index 8cf01b5f4f..da9c30d0d0 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; +import java.util.Collection; import java.util.Map; import java.util.TreeMap; import java.util.logging.Level; @@ -46,9 +47,9 @@ public class ShortCuts implements IRestorable _owner = owner; } - public Shortcut[] getAllShortCuts() + public Collection getAllShortCuts() { - return _shortCuts.values().toArray(new Shortcut[_shortCuts.values().size()]); + return _shortCuts.values(); } public Shortcut getShortCut(int slot, int page) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/TradeList.java index 2ad4b3d9f6..40140ac8f7 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/TradeList.java @@ -105,9 +105,9 @@ public class TradeList /** * @return all items from TradeList */ - public TradeItem[] getItems() + public Collection getItems() { - return _items.toArray(new TradeItem[_items.size()]); + return _items; } /** @@ -857,7 +857,7 @@ public class TradeList final InventoryUpdate playerIU = new InventoryUpdate(); long totalPrice = 0; - final TradeItem[] sellerItems = _items.toArray(new TradeItem[0]); + final TradeItem[] sellerItems = _items.toArray(new TradeItem[_items.size()]); for (ItemRequest item : requestedItems) { // searching item in tradelist using itemId diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 7f98f95df0..c45fd7f802 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1277,19 +1277,19 @@ public class PlayerInstance extends Playable } /** - * @return a table containing all Common RecipeList of the PlayerInstance. + * @return a collection containing all Common RecipeList of the PlayerInstance. */ - public RecipeList[] getCommonRecipeBook() + public Collection getCommonRecipeBook() { - return _commonRecipeBook.values().toArray(new RecipeList[_commonRecipeBook.values().size()]); + return _commonRecipeBook.values(); } /** - * @return a table containing all Dwarf RecipeList of the PlayerInstance. + * @return a collection containing all Dwarf RecipeList of the PlayerInstance. */ - public RecipeList[] getDwarvenRecipeBook() + public Collection getDwarvenRecipeBook() { - return _dwarvenRecipeBook.values().toArray(new RecipeList[_dwarvenRecipeBook.values().size()]); + return _dwarvenRecipeBook.values(); } /** @@ -1557,9 +1557,9 @@ public class PlayerInstance extends Playable } /** - * @return a table containing all ShortCut of the PlayerInstance. + * @return a collection containing all ShortCut of the PlayerInstance. */ - public Shortcut[] getAllShortCuts() + public Collection getAllShortCuts() { return _shortCuts.getAllShortCuts(); } @@ -2213,7 +2213,7 @@ public class PlayerInstance extends Playable } // Equip or unEquip - ItemInstance[] items = null; + List items = null; final boolean isEquiped = item.isEquipped(); final int oldInvLimit = getInventoryLimit(); SystemMessage sm = null; @@ -2282,7 +2282,7 @@ public class PlayerInstance extends Playable broadcastUserInfo(); final InventoryUpdate iu = new InventoryUpdate(); - iu.addItems(Arrays.asList(items)); + iu.addItems(items); sendInventoryUpdate(iu); if (abortAttack) @@ -5859,9 +5859,9 @@ public class PlayerInstance extends Playable return false; } - final ItemInstance[] unequiped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : unequipped) { iu.addModifiedItem(itm); } @@ -5871,19 +5871,20 @@ public class PlayerInstance extends Playable broadcastUserInfo(); // This can be 0 if the user pressed the right mousebutton twice very fast. - if (unequiped.length > 0) + if (!unequipped.isEmpty()) { final SystemMessage sm; - if (unequiped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED); - sm.addInt(unequiped[0].getEnchantLevel()); - sm.addItemName(unequiped[0]); + sm.addInt(unequippedItem.getEnchantLevel()); + sm.addItemName(unequippedItem); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); - sm.addItemName(unequiped[0]); + sm.addItemName(unequippedItem); } sendPacket(sm); } @@ -5899,9 +5900,9 @@ public class PlayerInstance extends Playable final ItemInstance sld = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (sld != null) { - final ItemInstance[] unequiped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : unequipped) { iu.addModifiedItem(itm); } @@ -5911,19 +5912,20 @@ public class PlayerInstance extends Playable broadcastUserInfo(); // this can be 0 if the user pressed the right mousebutton twice very fast - if (unequiped.length > 0) + if (!unequipped.isEmpty()) { SystemMessage sm = null; - if (unequiped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED); - sm.addInt(unequiped[0].getEnchantLevel()); - sm.addItemName(unequiped[0]); + sm.addInt(unequippedItem.getEnchantLevel()); + sm.addItemName(unequippedItem); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); - sm.addItemName(unequiped[0]); + sm.addItemName(unequippedItem); } sendPacket(sm); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/clan/Clan.java index e9da636180..045b9060b8 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -22,6 +22,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -1288,13 +1289,13 @@ public class Clan implements IIdentifiable, INamable /** * @return all the clan skills. */ - public Skill[] getAllSkills() + public Collection getAllSkills() { if (_skills == null) { - return new Skill[0]; + return Collections.emptyList(); } - return _skills.values().toArray(new Skill[_skills.values().size()]); + return _skills.values(); } /** @@ -1829,13 +1830,13 @@ public class Clan implements IIdentifiable, INamable * Used to retrieve all subPledges * @return */ - public SubPledge[] getAllSubPledges() + public Collection getAllSubPledges() { if (_subPledges == null) { - return new SubPledge[0]; + return Collections.emptyList(); } - return _subPledges.values().toArray(new SubPledge[_subPledges.values().size()]); + return _subPledges.values(); } public SubPledge createSubPledge(PlayerInstance player, int pledgeTypeValue, int leaderId, String subPledgeName) @@ -2068,9 +2069,9 @@ public class Clan implements IIdentifiable, INamable /** * @return all RankPrivs. */ - public RankPrivs[] getAllRankPrivs() + public Collection getAllRankPrivs() { - return _privs == null ? new RankPrivs[0] : _privs.values().toArray(new RankPrivs[_privs.values().size()]); + return _privs == null ? Collections.emptyList() : _privs.values(); } public int getLeaderSubPledge(int leaderId) @@ -2930,7 +2931,7 @@ public class Clan implements IIdentifiable, INamable return false; } - public SubPledgeSkill[] getAllSubSkills() + public List getAllSubSkills() { final List list = new LinkedList<>(); for (Skill skill : _subPledgeSkills.values()) @@ -2944,7 +2945,7 @@ public class Clan implements IIdentifiable, INamable list.add(new SubPledgeSkill(subunit.getId(), skill.getId(), skill.getLevel())); } } - return list.toArray(new SubPledgeSkill[list.size()]); + return list; } public void setNewLeaderId(int objectId, boolean storeInDb) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 7d8f8d63f7..f3a7ca045c 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -2962,9 +2962,8 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime // Destroy the quantity of items wanted if (item.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(item.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInBodySlotAndRecord(item.getItem().getBodyPart())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index f14581064a..0161150ecb 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -347,7 +347,7 @@ public class ItemAuctionInstance return _auctions.get(auctionId); } - public ItemAuction[] getAuctionsByBidder(int bidderObjId) + public ArrayList getAuctionsByBidder(int bidderObjId) { final Collection auctions = getAuctions(); final ArrayList stack = new ArrayList<>(auctions.size()); @@ -362,7 +362,7 @@ public class ItemAuctionInstance } } } - return stack.toArray(new ItemAuction[stack.size()]); + return stack; } public Collection getAuctions() diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 5e6c5b0f0f..49b6ed9250 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -25,8 +25,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; import java.util.function.Predicate; import java.util.logging.Level; @@ -143,7 +141,7 @@ public abstract class Inventory extends ItemContainer private static final class ChangeRecorder implements PaperdollListener { private final Inventory _inventory; - private final Set _changed = ConcurrentHashMap.newKeySet(); + private final List _changed = new ArrayList<>(1); /** * Constructor of the ChangeRecorder @@ -183,9 +181,9 @@ public abstract class Inventory extends ItemContainer * Returns alterations in inventory * @return ItemInstance[] : array of altered items */ - public ItemInstance[] getChangedItems() + public List getChangedItems() { - return _changed.toArray(new ItemInstance[_changed.size()]); + return _changed; } } @@ -1527,12 +1525,11 @@ public abstract class Inventory extends ItemContainer * Unequips item in body slot and returns alterations.
* If you dont need return value use {@link Inventory#unEquipItemInBodySlot(int)} instead * @param slot : int designating the slot of the paperdoll - * @return ItemInstance[] : list of changes + * @return List : List of changes */ - public ItemInstance[] unEquipItemInBodySlotAndRecord(int slot) + public List unEquipItemInBodySlotAndRecord(int slot) { final ChangeRecorder recorder = newRecorder(); - try { unEquipItemInBodySlot(slot); @@ -1558,12 +1555,11 @@ public abstract class Inventory extends ItemContainer * Unequips item in slot and returns alterations
* If you dont need return value use {@link Inventory#unEquipItemInSlot(int)} instead * @param slot : int designating the slot - * @return ItemInstance[] : list of items altered + * @return List : List of items altered */ - public ItemInstance[] unEquipItemInSlotAndRecord(int slot) + public List unEquipItemInSlotAndRecord(int slot) { final ChangeRecorder recorder = newRecorder(); - try { unEquipItemInSlot(slot); @@ -1731,12 +1727,11 @@ public abstract class Inventory extends ItemContainer * Equips item and returns list of alterations
* If you don't need return value use {@link Inventory#equipItem(ItemInstance)} instead * @param item : ItemInstance corresponding to the item - * @return ItemInstance[] : list of alterations + * @return List : List of alterations */ - public ItemInstance[] equipItemAndRecord(ItemInstance item) + public List equipItemAndRecord(ItemInstance item) { final ChangeRecorder recorder = newRecorder(); - try { equipItem(item); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java index 46adfaa5af..57bd460a09 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -1370,9 +1370,8 @@ public class ItemInstance extends WorldObject // unequip if (isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance item : unequiped) + for (ItemInstance item : player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot())) { iu.addModifiedItem(item); } @@ -1800,9 +1799,8 @@ public class ItemInstance extends WorldObject { if (isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance item : unequiped) + for (ItemInstance item : player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot())) { iu.addModifiedItem(item); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/GameClient.java index 99c66513d8..d42e5bf53a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/GameClient.java @@ -21,6 +21,7 @@ import java.net.InetSocketAddress; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; +import java.util.List; import java.util.concurrent.locks.ReentrantLock; import java.util.logging.Level; import java.util.logging.Logger; @@ -78,7 +79,7 @@ public class GameClient extends ChannelInboundHandler private PlayerInstance _player; private SecondaryPasswordAuth _secondaryAuth; private ClientHardwareInfoHolder _hardwareInfo; - private CharSelectInfoPackage[] _charSlotMapping = null; + private List _charSlotMapping = null; private volatile boolean _isDetached = false; private boolean _isAuthedGG; private boolean _protocolOk; @@ -568,21 +569,18 @@ public class GameClient extends ChannelInboundHandler return player; } - /** - * @param chars - */ - public void setCharSelection(CharSelectInfoPackage[] chars) + public void setCharSelection(List characters) { - _charSlotMapping = chars; + _charSlotMapping = characters; } public CharSelectInfoPackage getCharSelection(int charslot) { - if ((_charSlotMapping == null) || (charslot < 0) || (charslot >= _charSlotMapping.length)) + if ((_charSlotMapping == null) || (charslot < 0) || (charslot >= _charSlotMapping.size())) { return null; } - return _charSlotMapping[charslot]; + return _charSlotMapping.get(charslot); } public SecondaryPasswordAuth getSecondaryAuth() diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index fc1fe1cfd5..a92a75f977 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -202,9 +202,8 @@ public class RequestCrystallizeItem implements IClientIncomingPacket SystemMessage sm; if (itemToRemove.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance item : unequiped) + for (ItemInstance item : player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot())) { iu.addModifiedItem(item); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index a4accd8a47..0ec5a4d649 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -193,9 +193,8 @@ public class RequestDestroyItem implements IClientIncomingPacket client.sendPacket(sm); } - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index eec6279105..43ee474a75 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -309,12 +309,10 @@ public class RequestEnchantItem implements IClientIncomingPacket client.sendPacket(sm); } - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot()); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot())) { iu.addModifiedItem(itm); } - player.sendInventoryUpdate(iu); player.broadcastUserInfo(); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java index 730bd1b8f7..2bc2964039 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.clan.Clan.RankPrivs; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.PledgePowerGradeList; @@ -47,8 +46,7 @@ public class RequestPledgePowerGradeList implements IClientIncomingPacket final Clan clan = player.getClan(); if (clan != null) { - final RankPrivs[] privs = clan.getAllRankPrivs(); - player.sendPacket(new PledgePowerGradeList(privs)); + player.sendPacket(new PledgePowerGradeList(clan.getAllRankPrivs())); } } } \ No newline at end of file diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java index 71208c602d..1b039f8cc7 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java @@ -18,9 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.MAX_ADENA; -import java.util.Arrays; -import java.util.List; - import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.RecipeData; @@ -100,14 +97,11 @@ public class RequestRecipeShopListSet implements IClientIncomingPacket return; } - final List dwarfRecipes = Arrays.asList(player.getDwarvenRecipeBook()); - final List commonRecipes = Arrays.asList(player.getCommonRecipeBook()); player.getManufactureItems().clear(); - for (ManufactureItem i : _items) { final RecipeList list = RecipeData.getInstance().getRecipeList(i.getRecipeId()); - if (!dwarfRecipes.contains(list) && !commonRecipes.contains(list)) + if (!player.getDwarvenRecipeBook().contains(list) && !player.getCommonRecipeBook().contains(list)) { Util.handleIllegalPlayerAction(player, "Warning!! Player " + player.getName() + " of account " + player.getAccountName() + " tried to set recipe which he dont have.", Config.DEFAULT_PUNISH); return; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java index 0933d607bd..21176be244 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java @@ -109,8 +109,7 @@ public class RequestRefine extends AbstractRefinePacket final InventoryUpdate iu = new InventoryUpdate(); if (targetItem.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot()); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java index 240322a5da..a420f830b1 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java @@ -92,8 +92,7 @@ public class RequestRefineCancel implements IClientIncomingPacket final InventoryUpdate iu = new InventoryUpdate(); if (targetItem.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot()); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index 77150b7853..5df7fd1754 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.Arrays; +import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.PlayerCondOverride; @@ -99,27 +99,28 @@ public class RequestUnEquipItem implements IClientIncomingPacket return; } - final ItemInstance[] unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); player.broadcastUserInfo(); // This can be 0 if the user pressed the right mouse button twice very fast. - if (unequipped.length > 0) + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); + if (!unequipped.isEmpty()) { SystemMessage sm = null; - if (unequipped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED); - sm.addInt(unequipped[0].getEnchantLevel()); + sm.addInt(unequippedItem.getEnchantLevel()); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); } - sm.addItemName(unequipped[0]); + sm.addItemName(unequippedItem); client.sendPacket(sm); final InventoryUpdate iu = new InventoryUpdate(); - iu.addItems(Arrays.asList(unequipped)); + iu.addItems(unequipped); player.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java index 53048db3ea..9579246e5a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java @@ -69,7 +69,7 @@ public abstract class AbstractInventoryUpdate extends AbstractItemPacket _items.put(item.getObjectId(), new ItemInfo(item, 3)); } - public void addItems(List items) + public void addItems(Collection items) { for (ItemInstance item : items) { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 5a9ce7f545..be1add27e1 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -47,7 +47,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket private final String _loginName; private final int _sessionId; private int _activeId; - private final CharSelectInfoPackage[] _characterPackages; + private final List _characterPackages; private static final int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { @@ -83,7 +83,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket _activeId = activeId; } - public CharSelectInfoPackage[] getCharInfo() + public List getCharInfo() { return _characterPackages; } @@ -93,7 +93,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket { OutgoingPackets.CHARACTER_SELECTION_INFO.writeId(packet); - final int size = _characterPackages.length; + final int size = _characterPackages.size(); packet.writeD(size); // Created character count packet.writeD(Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT); // Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) ) @@ -107,9 +107,9 @@ public class CharSelectionInfo implements IClientOutgoingPacket { for (int i = 0; i < size; i++) { - if (lastAccess < _characterPackages[i].getLastAccess()) + if (lastAccess < _characterPackages.get(i).getLastAccess()) { - lastAccess = _characterPackages[i].getLastAccess(); + lastAccess = _characterPackages.get(i).getLastAccess(); _activeId = i; } } @@ -117,7 +117,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket for (int i = 0; i < size; i++) { - final CharSelectInfoPackage charInfoPackage = _characterPackages[i]; + final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i); packet.writeS(charInfoPackage.getName()); // Character name packet.writeD(charInfoPackage.getObjectId()); // Character ID packet.writeS(_loginName); // Account name @@ -219,7 +219,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket return true; } - private static CharSelectInfoPackage[] loadCharacterSelectInfo(String loginName) + private static List loadCharacterSelectInfo(String loginName) { CharSelectInfoPackage charInfopackage; final List characterList = new LinkedList<>(); @@ -245,13 +245,13 @@ public class CharSelectionInfo implements IClientOutgoingPacket } } } - return characterList.toArray(new CharSelectInfoPackage[characterList.size()]); } catch (Exception e) { LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } - return new CharSelectInfoPackage[0]; + + return characterList; } private static void loadCharacterSubclassInfo(CharSelectInfoPackage charInfopackage, int objectId, int activeClassId) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java index 20d42578b2..4ae5ffe316 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.clan.Clan; @@ -39,12 +41,12 @@ public class ExPledgeRecruitInfo implements IClientOutgoingPacket { OutgoingPackets.EX_PLEDGE_RECRUIT_INFO.writeId(packet); - final SubPledge[] subPledges = _clan.getAllSubPledges(); + final Collection subPledges = _clan.getAllSubPledges(); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); packet.writeD(_clan.getLevel()); packet.writeD(_clan.getMembersCount()); - packet.writeD(subPledges.length); + packet.writeD(subPledges.size()); for (SubPledge subPledge : subPledges) { packet.writeD(subPledge.getId()); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java index cb2e18edb9..fce9f86d25 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java @@ -16,15 +16,17 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan.RankPrivs; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PledgePowerGradeList implements IClientOutgoingPacket { - private final RankPrivs[] _privs; + private final Collection _privs; - public PledgePowerGradeList(RankPrivs[] privs) + public PledgePowerGradeList(Collection privs) { _privs = privs; } @@ -33,8 +35,7 @@ public class PledgePowerGradeList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_POWER_GRADE_LIST.writeId(packet); - - packet.writeD(_privs.length); + packet.writeD(_privs.size()); for (RankPrivs temp : _privs) { packet.writeD(temp.getRank()); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java index eab507b686..591ab8690a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java @@ -16,6 +16,9 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; +import java.util.List; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.skills.Skill; @@ -26,8 +29,8 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class PledgeSkillList implements IClientOutgoingPacket { - private final Skill[] _skills; - private final SubPledgeSkill[] _subSkills; + private final Collection _skills; + private final List _subSkills; public static class SubPledgeSkill { @@ -53,9 +56,8 @@ public class PledgeSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SKILL_LIST.writeId(packet); - - packet.writeD(_skills.length); - packet.writeD(_subSkills.length); // Squad skill length + packet.writeD(_skills.size()); + packet.writeD(_subSkills.size()); // Squad skill length for (Skill sk : _skills) { packet.writeD(sk.getDisplayId()); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java index 88a45c71fc..38f43a3fe0 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java @@ -48,7 +48,7 @@ public class PrivateStoreListSell extends AbstractItemPacket packet.writeD(_seller.getSellList().isPackaged() ? 1 : 0); packet.writeQ(_player.getAdena()); packet.writeD(0x00); - packet.writeD(_seller.getSellList().getItems().length); + packet.writeD(_seller.getSellList().getItems().size()); for (TradeItem item : _seller.getSellList().getItems()) { writeItem(packet, item); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index 4d008a0373..2e24347ed8 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -29,7 +29,7 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket private final int _objId; private final long _playerAdena; private final Collection _itemList; - private final TradeItem[] _buyList; + private final Collection _buyList; public PrivateStoreManageListBuy(PlayerInstance player) { @@ -54,7 +54,7 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(_buyList.length); // count for all items already added for buy + packet.writeD(_buyList.size()); // count for all items already added for buy for (TradeItem item : _buyList) { writeItem(packet, item); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java index c9a83efd9e..a3ccdb4605 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java @@ -29,7 +29,7 @@ public class PrivateStoreManageListSell extends AbstractItemPacket private final long _playerAdena; private final boolean _packageSale; private final Collection _itemList; - private final TradeItem[] _sellList; + private final Collection _sellList; public PrivateStoreManageListSell(PlayerInstance player, boolean isPackageSale) { @@ -57,7 +57,7 @@ public class PrivateStoreManageListSell extends AbstractItemPacket packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(_sellList.length); // count for any items already added for sell + packet.writeD(_sellList.size()); // count for any items already added for sell for (TradeItem item : _sellList) { writeItem(packet, item); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java index 67d9ba4762..3918894601 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java @@ -16,13 +16,15 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.network.OutgoingPackets; public class RecipeBookItemList implements IClientOutgoingPacket { - private RecipeList[] _recipes; + private Collection _recipes; private final boolean _isDwarvenCraft; private final int _maxMp; @@ -32,7 +34,7 @@ public class RecipeBookItemList implements IClientOutgoingPacket _maxMp = maxMp; } - public void addRecipes(RecipeList[] recipeBook) + public void addRecipes(Collection recipeBook) { _recipes = recipeBook; } @@ -51,11 +53,13 @@ public class RecipeBookItemList implements IClientOutgoingPacket } else { - packet.writeD(_recipes.length); // number of items in recipe book - for (int i = 0; i < _recipes.length; i++) + packet.writeD(_recipes.size()); // number of items in recipe book + int count = 0; + for (RecipeList recipe : _recipes) { - packet.writeD(_recipes[i].getId()); - packet.writeD(i + 1); + count++; + packet.writeD(recipe.getId()); + packet.writeD(count); } } return true; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java index e7b2df947d..8939863a30 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; import java.util.Iterator; import org.l2jmobius.commons.network.PacketWriter; @@ -28,7 +29,7 @@ public class RecipeShopManageList implements IClientOutgoingPacket { private final PlayerInstance _seller; private final boolean _isDwarven; - private RecipeList[] _recipes; + private Collection _recipes; public RecipeShopManageList(PlayerInstance seller, boolean isDwarven) { @@ -73,13 +74,13 @@ public class RecipeShopManageList implements IClientOutgoingPacket } else { - packet.writeD(_recipes.length); // number of items in recipe book - - for (int i = 0; i < _recipes.length; i++) + packet.writeD(_recipes.size()); // number of items in recipe book + int count = 0; + for (RecipeList recipe : _recipes) { - final RecipeList temp = _recipes[i]; - packet.writeD(temp.getId()); - packet.writeD(i + 1); + count++; + packet.writeD(recipe.getId()); + packet.writeD(count); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java index e26ea77d9c..686484c824 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -23,7 +25,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ShortCutInit implements IClientOutgoingPacket { - private Shortcut[] _shortCuts; + private Collection _shortCuts; public ShortCutInit(PlayerInstance player) { @@ -40,7 +42,7 @@ public class ShortCutInit implements IClientOutgoingPacket { OutgoingPackets.SHORT_CUT_INIT.writeId(packet); - packet.writeD(_shortCuts.length); + packet.writeD(_shortCuts.size()); for (Shortcut sc : _shortCuts) { packet.writeD(sc.getType().ordinal()); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java index 7e32d855fe..bfb530ca83 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets.attributechange; +import java.util.List; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -26,13 +28,13 @@ import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket; */ public class ExChangeAttributeItemList extends AbstractItemPacket { - private final ItemInfo[] _itemsList; + private final List _itemsList; private final int _itemId; - public ExChangeAttributeItemList(int itemId, ItemInfo[] itemsList) + public ExChangeAttributeItemList(int itemId, List itemList) { _itemId = itemId; - _itemsList = itemsList; + _itemsList = itemList; } @Override @@ -40,7 +42,7 @@ public class ExChangeAttributeItemList extends AbstractItemPacket { OutgoingPackets.EX_CHANGE_ATTRIBUTE_ITEM_LIST.writeId(packet); packet.writeD(_itemId); - packet.writeD(_itemsList.length); + packet.writeD(_itemsList.size()); for (ItemInfo item : _itemsList) { writeItem(packet, item); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java index 771c0e3848..a34595ca73 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java @@ -594,9 +594,8 @@ public class AdminMobGroup implements IAdminCommandHandler private void showGroupList(PlayerInstance activeChar) { - final MobGroup[] mobGroupList = MobGroupTable.getInstance().getGroups(); BuilderUtil.sendSysMessage(activeChar, "======= ======="); - for (MobGroup mobGroup : mobGroupList) + for (MobGroup mobGroup : MobGroupTable.getInstance().getGroups()) { activeChar.sendMessage(mobGroup.getGroupId() + ": " + mobGroup.getActiveMobCount() + " alive out of " + mobGroup.getMaxMobCount() + " of NPC ID " + mobGroup.getTemplate().getId() + " (" + mobGroup.getStatus() + ")"); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java index 11c52819e5..636639079c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java @@ -99,9 +99,8 @@ public class ItemAuctionLink implements IBypassHandler } else if ("cancel".equalsIgnoreCase(cmd)) { - final ItemAuction[] auctions = au.getAuctionsByBidder(player.getObjectId()); boolean returned = false; - for (ItemAuction auction : auctions) + for (ItemAuction auction : au.getAuctionsByBidder(player.getObjectId())) { if (auction.cancelBid(player)) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index 7e2471da71..b82ae4a5bd 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -16,6 +16,8 @@ */ package handlers.effecthandlers; +import java.util.List; + import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -84,7 +86,7 @@ public class ConvertItem extends AbstractEffect final int enchantLevel = wpn.getEnchantLevel(); final AttributeHolder elementals = wpn.getAttributes() == null ? null : wpn.getAttackAttribute(); - final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (ItemInstance unequippedItem : unequiped) { @@ -92,10 +94,11 @@ public class ConvertItem extends AbstractEffect } player.sendInventoryUpdate(iu); - if (unequiped.length <= 0) + if (unequiped.isEmpty()) { return; } + byte count = 0; for (ItemInstance unequippedItem : unequiped) { @@ -120,7 +123,7 @@ public class ConvertItem extends AbstractEffect player.sendPacket(sm); } - if (count == unequiped.length) + if (count == unequiped.size()) { return; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index f393955568..5fdd08dd5f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -16,6 +16,7 @@ */ package handlers.effecthandlers; +import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -67,11 +68,11 @@ public class Disarmor extends AbstractEffect } final PlayerInstance player = effected.getActingPlayer(); - final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); - if (unequiped.length > 0) + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); + if (!unequipped.isEmpty()) { final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : unequipped) { iu.addModifiedItem(itm); } @@ -79,20 +80,21 @@ public class Disarmor extends AbstractEffect player.broadcastUserInfo(); SystemMessage sm = null; - if (unequiped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED); - sm.addInt(unequiped[0].getEnchantLevel()); - sm.addItemName(unequiped[0]); + sm.addInt(unequippedItem.getEnchantLevel()); + sm.addItemName(unequippedItem); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); - sm.addItemName(unequiped[0]); + sm.addItemName(unequippedItem); } player.sendPacket(sm); effected.getInventory().blockItemSlot(_slot); - _unequippedItems.put(effected.getObjectId(), unequiped[0].getObjectId()); + _unequippedItems.put(effected.getObjectId(), unequippedItem.getObjectId()); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 19954820bc..119a616831 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -82,7 +82,7 @@ public class ChangeAttributeCrystal implements IItemHandler return false; } - player.sendPacket(new ExChangeAttributeItemList(item.getId(), itemList.toArray(new ItemInfo[itemList.size()]))); + player.sendPacket(new ExChangeAttributeItemList(item.getId(), itemList)); return true; } } \ No newline at end of file diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Recipes.java index 9e13e4dc41..72d0129db1 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Recipes.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Recipes.java @@ -72,13 +72,13 @@ public class Recipes implements IItemHandler { canCraft = player.hasDwarvenCraft(); recipeLevel = (rp.getLevel() > player.getDwarvenCraft()); - recipeLimit = (player.getDwarvenRecipeBook().length >= player.getDwarfRecipeLimit()); + recipeLimit = (player.getDwarvenRecipeBook().size() >= player.getDwarfRecipeLimit()); } else { canCraft = player.hasCommonCraft(); recipeLevel = (rp.getLevel() > player.getCommonCraft()); - recipeLimit = (player.getCommonRecipeBook().length >= player.getCommonRecipeLimit()); + recipeLimit = (player.getCommonRecipeBook().size() >= player.getCommonRecipeLimit()); } if (!canCraft) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/RecipeController.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/RecipeController.java index 37d4ea9698..ad0d6f053d 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/RecipeController.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/RecipeController.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -89,9 +88,7 @@ public class RecipeController return; } - final List dwarfRecipes = Arrays.asList(manufacturer.getDwarvenRecipeBook()); - final List commonRecipes = Arrays.asList(manufacturer.getCommonRecipeBook()); - if (!dwarfRecipes.contains(recipeList) && !commonRecipes.contains(recipeList)) + if (!manufacturer.getDwarvenRecipeBook().contains(recipeList) && !manufacturer.getCommonRecipeBook().contains(recipeList)) { Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " sent a false recipe id.", Config.DEFAULT_PUNISH); return; @@ -134,9 +131,7 @@ public class RecipeController return; } - final List dwarfRecipes = Arrays.asList(player.getDwarvenRecipeBook()); - final List commonRecipes = Arrays.asList(player.getCommonRecipeBook()); - if (!dwarfRecipes.contains(recipeList) && !commonRecipes.contains(recipeList)) + if (!player.getDwarvenRecipeBook().contains(recipeList) && !player.getCommonRecipeBook().contains(recipeList)) { Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " sent a false recipe id.", Config.DEFAULT_PUNISH); return; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/MacroList.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/MacroList.java index 2411db329d..ead95f13ea 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/MacroList.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/MacroList.java @@ -90,8 +90,7 @@ public class MacroList implements IRestorable deleteMacroFromDb(removed); } - final Shortcut[] allShortCuts = _owner.getAllShortCuts(); - for (Shortcut sc : allShortCuts) + for (Shortcut sc : _owner.getAllShortCuts()) { if ((sc.getId() == id) && (sc.getType() == ShortcutType.MACRO)) { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/MobGroupTable.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/MobGroupTable.java index 244fd07964..e61d726687 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/MobGroupTable.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/MobGroupTable.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.model; +import java.util.Collection; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -67,9 +68,9 @@ public class MobGroupTable return null; } - public MobGroup[] getGroups() + public Collection getGroups() { - return _groupMap.values().toArray(new MobGroup[_groupMap.size()]); + return _groupMap.values(); } public boolean removeGroup(int groupKey) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/ShortCuts.java index 8cf01b5f4f..da9c30d0d0 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; +import java.util.Collection; import java.util.Map; import java.util.TreeMap; import java.util.logging.Level; @@ -46,9 +47,9 @@ public class ShortCuts implements IRestorable _owner = owner; } - public Shortcut[] getAllShortCuts() + public Collection getAllShortCuts() { - return _shortCuts.values().toArray(new Shortcut[_shortCuts.values().size()]); + return _shortCuts.values(); } public Shortcut getShortCut(int slot, int page) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/TradeList.java index 2ad4b3d9f6..40140ac8f7 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/TradeList.java @@ -105,9 +105,9 @@ public class TradeList /** * @return all items from TradeList */ - public TradeItem[] getItems() + public Collection getItems() { - return _items.toArray(new TradeItem[_items.size()]); + return _items; } /** @@ -857,7 +857,7 @@ public class TradeList final InventoryUpdate playerIU = new InventoryUpdate(); long totalPrice = 0; - final TradeItem[] sellerItems = _items.toArray(new TradeItem[0]); + final TradeItem[] sellerItems = _items.toArray(new TradeItem[_items.size()]); for (ItemRequest item : requestedItems) { // searching item in tradelist using itemId diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 05aa9942c3..7a2b898f4a 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1283,19 +1283,19 @@ public class PlayerInstance extends Playable } /** - * @return a table containing all Common RecipeList of the PlayerInstance. + * @return a collection containing all Common RecipeList of the PlayerInstance. */ - public RecipeList[] getCommonRecipeBook() + public Collection getCommonRecipeBook() { - return _commonRecipeBook.values().toArray(new RecipeList[_commonRecipeBook.values().size()]); + return _commonRecipeBook.values(); } /** - * @return a table containing all Dwarf RecipeList of the PlayerInstance. + * @return a collection containing all Dwarf RecipeList of the PlayerInstance. */ - public RecipeList[] getDwarvenRecipeBook() + public Collection getDwarvenRecipeBook() { - return _dwarvenRecipeBook.values().toArray(new RecipeList[_dwarvenRecipeBook.values().size()]); + return _dwarvenRecipeBook.values(); } /** @@ -1563,9 +1563,9 @@ public class PlayerInstance extends Playable } /** - * @return a table containing all ShortCut of the PlayerInstance. + * @return a collection containing all ShortCut of the PlayerInstance. */ - public Shortcut[] getAllShortCuts() + public Collection getAllShortCuts() { return _shortCuts.getAllShortCuts(); } @@ -2219,7 +2219,7 @@ public class PlayerInstance extends Playable } // Equip or unEquip - ItemInstance[] items = null; + List items = null; final boolean isEquiped = item.isEquipped(); final int oldInvLimit = getInventoryLimit(); SystemMessage sm = null; @@ -2288,7 +2288,7 @@ public class PlayerInstance extends Playable broadcastUserInfo(); final InventoryUpdate iu = new InventoryUpdate(); - iu.addItems(Arrays.asList(items)); + iu.addItems(items); sendInventoryUpdate(iu); if (abortAttack) @@ -5865,9 +5865,9 @@ public class PlayerInstance extends Playable return false; } - final ItemInstance[] unequiped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : unequipped) { iu.addModifiedItem(itm); } @@ -5877,19 +5877,20 @@ public class PlayerInstance extends Playable broadcastUserInfo(); // This can be 0 if the user pressed the right mousebutton twice very fast. - if (unequiped.length > 0) + if (!unequipped.isEmpty()) { final SystemMessage sm; - if (unequiped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED); - sm.addInt(unequiped[0].getEnchantLevel()); - sm.addItemName(unequiped[0]); + sm.addInt(unequippedItem.getEnchantLevel()); + sm.addItemName(unequippedItem); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); - sm.addItemName(unequiped[0]); + sm.addItemName(unequippedItem); } sendPacket(sm); } @@ -5905,9 +5906,9 @@ public class PlayerInstance extends Playable final ItemInstance sld = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (sld != null) { - final ItemInstance[] unequiped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : unequipped) { iu.addModifiedItem(itm); } @@ -5917,19 +5918,20 @@ public class PlayerInstance extends Playable broadcastUserInfo(); // this can be 0 if the user pressed the right mousebutton twice very fast - if (unequiped.length > 0) + if (!unequipped.isEmpty()) { SystemMessage sm = null; - if (unequiped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED); - sm.addInt(unequiped[0].getEnchantLevel()); - sm.addItemName(unequiped[0]); + sm.addInt(unequippedItem.getEnchantLevel()); + sm.addItemName(unequippedItem); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); - sm.addItemName(unequiped[0]); + sm.addItemName(unequippedItem); } sendPacket(sm); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/clan/Clan.java index d76dcec76f..8a0b710671 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -22,6 +22,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -1289,13 +1290,13 @@ public class Clan implements IIdentifiable, INamable /** * @return all the clan skills. */ - public Skill[] getAllSkills() + public Collection getAllSkills() { if (_skills == null) { - return new Skill[0]; + return Collections.emptyList(); } - return _skills.values().toArray(new Skill[_skills.values().size()]); + return _skills.values(); } /** @@ -1830,13 +1831,13 @@ public class Clan implements IIdentifiable, INamable * Used to retrieve all subPledges * @return */ - public SubPledge[] getAllSubPledges() + public Collection getAllSubPledges() { if (_subPledges == null) { - return new SubPledge[0]; + return Collections.emptyList(); } - return _subPledges.values().toArray(new SubPledge[_subPledges.values().size()]); + return _subPledges.values(); } public SubPledge createSubPledge(PlayerInstance player, int pledgeTypeValue, int leaderId, String subPledgeName) @@ -2069,9 +2070,9 @@ public class Clan implements IIdentifiable, INamable /** * @return all RankPrivs. */ - public RankPrivs[] getAllRankPrivs() + public Collection getAllRankPrivs() { - return _privs == null ? new RankPrivs[0] : _privs.values().toArray(new RankPrivs[_privs.values().size()]); + return _privs == null ? Collections.emptyList() : _privs.values(); } public int getLeaderSubPledge(int leaderId) @@ -2931,7 +2932,7 @@ public class Clan implements IIdentifiable, INamable return false; } - public SubPledgeSkill[] getAllSubSkills() + public List getAllSubSkills() { final List list = new LinkedList<>(); for (Skill skill : _subPledgeSkills.values()) @@ -2945,7 +2946,7 @@ public class Clan implements IIdentifiable, INamable list.add(new SubPledgeSkill(subunit.getId(), skill.getId(), skill.getLevel())); } } - return list.toArray(new SubPledgeSkill[list.size()]); + return list; } public void setNewLeaderId(int objectId, boolean storeInDb) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 7d8f8d63f7..f3a7ca045c 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -2962,9 +2962,8 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime // Destroy the quantity of items wanted if (item.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(item.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInBodySlotAndRecord(item.getItem().getBodyPart())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index f14581064a..0161150ecb 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -347,7 +347,7 @@ public class ItemAuctionInstance return _auctions.get(auctionId); } - public ItemAuction[] getAuctionsByBidder(int bidderObjId) + public ArrayList getAuctionsByBidder(int bidderObjId) { final Collection auctions = getAuctions(); final ArrayList stack = new ArrayList<>(auctions.size()); @@ -362,7 +362,7 @@ public class ItemAuctionInstance } } } - return stack.toArray(new ItemAuction[stack.size()]); + return stack; } public Collection getAuctions() diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 47360c75df..33e7391d54 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -25,8 +25,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; import java.util.function.Predicate; import java.util.logging.Level; @@ -143,7 +141,7 @@ public abstract class Inventory extends ItemContainer private static final class ChangeRecorder implements PaperdollListener { private final Inventory _inventory; - private final Set _changed = ConcurrentHashMap.newKeySet(); + private final List _changed = new ArrayList<>(1); /** * Constructor of the ChangeRecorder @@ -183,9 +181,9 @@ public abstract class Inventory extends ItemContainer * Returns alterations in inventory * @return ItemInstance[] : array of altered items */ - public ItemInstance[] getChangedItems() + public List getChangedItems() { - return _changed.toArray(new ItemInstance[_changed.size()]); + return _changed; } } @@ -1533,12 +1531,11 @@ public abstract class Inventory extends ItemContainer * Unequips item in body slot and returns alterations.
* If you dont need return value use {@link Inventory#unEquipItemInBodySlot(int)} instead * @param slot : int designating the slot of the paperdoll - * @return ItemInstance[] : list of changes + * @return List : List of changes */ - public ItemInstance[] unEquipItemInBodySlotAndRecord(int slot) + public List unEquipItemInBodySlotAndRecord(int slot) { final ChangeRecorder recorder = newRecorder(); - try { unEquipItemInBodySlot(slot); @@ -1564,12 +1561,11 @@ public abstract class Inventory extends ItemContainer * Unequips item in slot and returns alterations
* If you dont need return value use {@link Inventory#unEquipItemInSlot(int)} instead * @param slot : int designating the slot - * @return ItemInstance[] : list of items altered + * @return List : List of items altered */ - public ItemInstance[] unEquipItemInSlotAndRecord(int slot) + public List unEquipItemInSlotAndRecord(int slot) { final ChangeRecorder recorder = newRecorder(); - try { unEquipItemInSlot(slot); @@ -1737,12 +1733,11 @@ public abstract class Inventory extends ItemContainer * Equips item and returns list of alterations
* If you don't need return value use {@link Inventory#equipItem(ItemInstance)} instead * @param item : ItemInstance corresponding to the item - * @return ItemInstance[] : list of alterations + * @return List : List of alterations */ - public ItemInstance[] equipItemAndRecord(ItemInstance item) + public List equipItemAndRecord(ItemInstance item) { final ChangeRecorder recorder = newRecorder(); - try { equipItem(item); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java index c3b6b052fc..abe6c64915 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -1375,9 +1375,8 @@ public class ItemInstance extends WorldObject // unequip if (isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance item : unequiped) + for (ItemInstance item : player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot())) { iu.addModifiedItem(item); } @@ -1811,9 +1810,8 @@ public class ItemInstance extends WorldObject { if (isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance item : unequiped) + for (ItemInstance item : player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot())) { iu.addModifiedItem(item); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/GameClient.java index 99c66513d8..d42e5bf53a 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/GameClient.java @@ -21,6 +21,7 @@ import java.net.InetSocketAddress; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; +import java.util.List; import java.util.concurrent.locks.ReentrantLock; import java.util.logging.Level; import java.util.logging.Logger; @@ -78,7 +79,7 @@ public class GameClient extends ChannelInboundHandler private PlayerInstance _player; private SecondaryPasswordAuth _secondaryAuth; private ClientHardwareInfoHolder _hardwareInfo; - private CharSelectInfoPackage[] _charSlotMapping = null; + private List _charSlotMapping = null; private volatile boolean _isDetached = false; private boolean _isAuthedGG; private boolean _protocolOk; @@ -568,21 +569,18 @@ public class GameClient extends ChannelInboundHandler return player; } - /** - * @param chars - */ - public void setCharSelection(CharSelectInfoPackage[] chars) + public void setCharSelection(List characters) { - _charSlotMapping = chars; + _charSlotMapping = characters; } public CharSelectInfoPackage getCharSelection(int charslot) { - if ((_charSlotMapping == null) || (charslot < 0) || (charslot >= _charSlotMapping.length)) + if ((_charSlotMapping == null) || (charslot < 0) || (charslot >= _charSlotMapping.size())) { return null; } - return _charSlotMapping[charslot]; + return _charSlotMapping.get(charslot); } public SecondaryPasswordAuth getSecondaryAuth() diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index fc1fe1cfd5..a92a75f977 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -202,9 +202,8 @@ public class RequestCrystallizeItem implements IClientIncomingPacket SystemMessage sm; if (itemToRemove.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance item : unequiped) + for (ItemInstance item : player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot())) { iu.addModifiedItem(item); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index a4accd8a47..0ec5a4d649 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -193,9 +193,8 @@ public class RequestDestroyItem implements IClientIncomingPacket client.sendPacket(sm); } - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 520c45b7ce..ff1d6c6916 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -309,12 +309,10 @@ public class RequestEnchantItem implements IClientIncomingPacket client.sendPacket(sm); } - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot()); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot())) { iu.addModifiedItem(itm); } - player.sendInventoryUpdate(iu); player.broadcastUserInfo(); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java index 730bd1b8f7..2bc2964039 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.clan.Clan.RankPrivs; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.PledgePowerGradeList; @@ -47,8 +46,7 @@ public class RequestPledgePowerGradeList implements IClientIncomingPacket final Clan clan = player.getClan(); if (clan != null) { - final RankPrivs[] privs = clan.getAllRankPrivs(); - player.sendPacket(new PledgePowerGradeList(privs)); + player.sendPacket(new PledgePowerGradeList(clan.getAllRankPrivs())); } } } \ No newline at end of file diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java index 71208c602d..1b039f8cc7 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java @@ -18,9 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.MAX_ADENA; -import java.util.Arrays; -import java.util.List; - import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.RecipeData; @@ -100,14 +97,11 @@ public class RequestRecipeShopListSet implements IClientIncomingPacket return; } - final List dwarfRecipes = Arrays.asList(player.getDwarvenRecipeBook()); - final List commonRecipes = Arrays.asList(player.getCommonRecipeBook()); player.getManufactureItems().clear(); - for (ManufactureItem i : _items) { final RecipeList list = RecipeData.getInstance().getRecipeList(i.getRecipeId()); - if (!dwarfRecipes.contains(list) && !commonRecipes.contains(list)) + if (!player.getDwarvenRecipeBook().contains(list) && !player.getCommonRecipeBook().contains(list)) { Util.handleIllegalPlayerAction(player, "Warning!! Player " + player.getName() + " of account " + player.getAccountName() + " tried to set recipe which he dont have.", Config.DEFAULT_PUNISH); return; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java index 0933d607bd..21176be244 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java @@ -109,8 +109,7 @@ public class RequestRefine extends AbstractRefinePacket final InventoryUpdate iu = new InventoryUpdate(); if (targetItem.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot()); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java index 240322a5da..a420f830b1 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java @@ -92,8 +92,7 @@ public class RequestRefineCancel implements IClientIncomingPacket final InventoryUpdate iu = new InventoryUpdate(); if (targetItem.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot()); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index 77150b7853..5df7fd1754 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.Arrays; +import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.PlayerCondOverride; @@ -99,27 +99,28 @@ public class RequestUnEquipItem implements IClientIncomingPacket return; } - final ItemInstance[] unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); player.broadcastUserInfo(); // This can be 0 if the user pressed the right mouse button twice very fast. - if (unequipped.length > 0) + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); + if (!unequipped.isEmpty()) { SystemMessage sm = null; - if (unequipped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED); - sm.addInt(unequipped[0].getEnchantLevel()); + sm.addInt(unequippedItem.getEnchantLevel()); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); } - sm.addItemName(unequipped[0]); + sm.addItemName(unequippedItem); client.sendPacket(sm); final InventoryUpdate iu = new InventoryUpdate(); - iu.addItems(Arrays.asList(unequipped)); + iu.addItems(unequipped); player.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java index 53048db3ea..9579246e5a 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java @@ -69,7 +69,7 @@ public abstract class AbstractInventoryUpdate extends AbstractItemPacket _items.put(item.getObjectId(), new ItemInfo(item, 3)); } - public void addItems(List items) + public void addItems(Collection items) { for (ItemInstance item : items) { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index db34e27e47..cba9f4f623 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -47,7 +47,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket private final String _loginName; private final int _sessionId; private int _activeId; - private final CharSelectInfoPackage[] _characterPackages; + private final List _characterPackages; private static final int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { @@ -83,7 +83,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket _activeId = activeId; } - public CharSelectInfoPackage[] getCharInfo() + public List getCharInfo() { return _characterPackages; } @@ -93,7 +93,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket { OutgoingPackets.CHARACTER_SELECTION_INFO.writeId(packet); - final int size = _characterPackages.length; + final int size = _characterPackages.size(); packet.writeD(size); // Created character count packet.writeD(Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT); // Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) ) @@ -107,9 +107,9 @@ public class CharSelectionInfo implements IClientOutgoingPacket { for (int i = 0; i < size; i++) { - if (lastAccess < _characterPackages[i].getLastAccess()) + if (lastAccess < _characterPackages.get(i).getLastAccess()) { - lastAccess = _characterPackages[i].getLastAccess(); + lastAccess = _characterPackages.get(i).getLastAccess(); _activeId = i; } } @@ -117,7 +117,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket for (int i = 0; i < size; i++) { - final CharSelectInfoPackage charInfoPackage = _characterPackages[i]; + final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i); packet.writeS(charInfoPackage.getName()); // Character name packet.writeD(charInfoPackage.getObjectId()); // Character ID packet.writeS(_loginName); // Account name @@ -218,7 +218,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket return true; } - private static CharSelectInfoPackage[] loadCharacterSelectInfo(String loginName) + private static List loadCharacterSelectInfo(String loginName) { CharSelectInfoPackage charInfopackage; final List characterList = new LinkedList<>(); @@ -244,13 +244,13 @@ public class CharSelectionInfo implements IClientOutgoingPacket } } } - return characterList.toArray(new CharSelectInfoPackage[characterList.size()]); } catch (Exception e) { LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } - return new CharSelectInfoPackage[0]; + + return characterList; } private static void loadCharacterSubclassInfo(CharSelectInfoPackage charInfopackage, int objectId, int activeClassId) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java index 20d42578b2..4ae5ffe316 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.clan.Clan; @@ -39,12 +41,12 @@ public class ExPledgeRecruitInfo implements IClientOutgoingPacket { OutgoingPackets.EX_PLEDGE_RECRUIT_INFO.writeId(packet); - final SubPledge[] subPledges = _clan.getAllSubPledges(); + final Collection subPledges = _clan.getAllSubPledges(); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); packet.writeD(_clan.getLevel()); packet.writeD(_clan.getMembersCount()); - packet.writeD(subPledges.length); + packet.writeD(subPledges.size()); for (SubPledge subPledge : subPledges) { packet.writeD(subPledge.getId()); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java index cb2e18edb9..fce9f86d25 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java @@ -16,15 +16,17 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan.RankPrivs; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PledgePowerGradeList implements IClientOutgoingPacket { - private final RankPrivs[] _privs; + private final Collection _privs; - public PledgePowerGradeList(RankPrivs[] privs) + public PledgePowerGradeList(Collection privs) { _privs = privs; } @@ -33,8 +35,7 @@ public class PledgePowerGradeList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_POWER_GRADE_LIST.writeId(packet); - - packet.writeD(_privs.length); + packet.writeD(_privs.size()); for (RankPrivs temp : _privs) { packet.writeD(temp.getRank()); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java index eab507b686..591ab8690a 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java @@ -16,6 +16,9 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; +import java.util.List; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.skills.Skill; @@ -26,8 +29,8 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class PledgeSkillList implements IClientOutgoingPacket { - private final Skill[] _skills; - private final SubPledgeSkill[] _subSkills; + private final Collection _skills; + private final List _subSkills; public static class SubPledgeSkill { @@ -53,9 +56,8 @@ public class PledgeSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SKILL_LIST.writeId(packet); - - packet.writeD(_skills.length); - packet.writeD(_subSkills.length); // Squad skill length + packet.writeD(_skills.size()); + packet.writeD(_subSkills.size()); // Squad skill length for (Skill sk : _skills) { packet.writeD(sk.getDisplayId()); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java index 88a45c71fc..38f43a3fe0 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java @@ -48,7 +48,7 @@ public class PrivateStoreListSell extends AbstractItemPacket packet.writeD(_seller.getSellList().isPackaged() ? 1 : 0); packet.writeQ(_player.getAdena()); packet.writeD(0x00); - packet.writeD(_seller.getSellList().getItems().length); + packet.writeD(_seller.getSellList().getItems().size()); for (TradeItem item : _seller.getSellList().getItems()) { writeItem(packet, item); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index 4d008a0373..2e24347ed8 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -29,7 +29,7 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket private final int _objId; private final long _playerAdena; private final Collection _itemList; - private final TradeItem[] _buyList; + private final Collection _buyList; public PrivateStoreManageListBuy(PlayerInstance player) { @@ -54,7 +54,7 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(_buyList.length); // count for all items already added for buy + packet.writeD(_buyList.size()); // count for all items already added for buy for (TradeItem item : _buyList) { writeItem(packet, item); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java index c9a83efd9e..a3ccdb4605 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java @@ -29,7 +29,7 @@ public class PrivateStoreManageListSell extends AbstractItemPacket private final long _playerAdena; private final boolean _packageSale; private final Collection _itemList; - private final TradeItem[] _sellList; + private final Collection _sellList; public PrivateStoreManageListSell(PlayerInstance player, boolean isPackageSale) { @@ -57,7 +57,7 @@ public class PrivateStoreManageListSell extends AbstractItemPacket packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(_sellList.length); // count for any items already added for sell + packet.writeD(_sellList.size()); // count for any items already added for sell for (TradeItem item : _sellList) { writeItem(packet, item); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java index 67d9ba4762..3918894601 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java @@ -16,13 +16,15 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.network.OutgoingPackets; public class RecipeBookItemList implements IClientOutgoingPacket { - private RecipeList[] _recipes; + private Collection _recipes; private final boolean _isDwarvenCraft; private final int _maxMp; @@ -32,7 +34,7 @@ public class RecipeBookItemList implements IClientOutgoingPacket _maxMp = maxMp; } - public void addRecipes(RecipeList[] recipeBook) + public void addRecipes(Collection recipeBook) { _recipes = recipeBook; } @@ -51,11 +53,13 @@ public class RecipeBookItemList implements IClientOutgoingPacket } else { - packet.writeD(_recipes.length); // number of items in recipe book - for (int i = 0; i < _recipes.length; i++) + packet.writeD(_recipes.size()); // number of items in recipe book + int count = 0; + for (RecipeList recipe : _recipes) { - packet.writeD(_recipes[i].getId()); - packet.writeD(i + 1); + count++; + packet.writeD(recipe.getId()); + packet.writeD(count); } } return true; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java index e7b2df947d..8939863a30 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; import java.util.Iterator; import org.l2jmobius.commons.network.PacketWriter; @@ -28,7 +29,7 @@ public class RecipeShopManageList implements IClientOutgoingPacket { private final PlayerInstance _seller; private final boolean _isDwarven; - private RecipeList[] _recipes; + private Collection _recipes; public RecipeShopManageList(PlayerInstance seller, boolean isDwarven) { @@ -73,13 +74,13 @@ public class RecipeShopManageList implements IClientOutgoingPacket } else { - packet.writeD(_recipes.length); // number of items in recipe book - - for (int i = 0; i < _recipes.length; i++) + packet.writeD(_recipes.size()); // number of items in recipe book + int count = 0; + for (RecipeList recipe : _recipes) { - final RecipeList temp = _recipes[i]; - packet.writeD(temp.getId()); - packet.writeD(i + 1); + count++; + packet.writeD(recipe.getId()); + packet.writeD(count); } } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java index 5bb5356fd0..e7a3655f52 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -23,7 +25,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ShortCutInit implements IClientOutgoingPacket { - private Shortcut[] _shortCuts; + private Collection _shortCuts; public ShortCutInit(PlayerInstance player) { @@ -40,7 +42,7 @@ public class ShortCutInit implements IClientOutgoingPacket { OutgoingPackets.SHORT_CUT_INIT.writeId(packet); - packet.writeD(_shortCuts.length); + packet.writeD(_shortCuts.size()); for (Shortcut sc : _shortCuts) { packet.writeD(sc.getType().ordinal()); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java index 7e32d855fe..bfb530ca83 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets.attributechange; +import java.util.List; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -26,13 +28,13 @@ import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket; */ public class ExChangeAttributeItemList extends AbstractItemPacket { - private final ItemInfo[] _itemsList; + private final List _itemsList; private final int _itemId; - public ExChangeAttributeItemList(int itemId, ItemInfo[] itemsList) + public ExChangeAttributeItemList(int itemId, List itemList) { _itemId = itemId; - _itemsList = itemsList; + _itemsList = itemList; } @Override @@ -40,7 +42,7 @@ public class ExChangeAttributeItemList extends AbstractItemPacket { OutgoingPackets.EX_CHANGE_ATTRIBUTE_ITEM_LIST.writeId(packet); packet.writeD(_itemId); - packet.writeD(_itemsList.length); + packet.writeD(_itemsList.size()); for (ItemInfo item : _itemsList) { writeItem(packet, item); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java index 771c0e3848..a34595ca73 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java @@ -594,9 +594,8 @@ public class AdminMobGroup implements IAdminCommandHandler private void showGroupList(PlayerInstance activeChar) { - final MobGroup[] mobGroupList = MobGroupTable.getInstance().getGroups(); BuilderUtil.sendSysMessage(activeChar, "======= ======="); - for (MobGroup mobGroup : mobGroupList) + for (MobGroup mobGroup : MobGroupTable.getInstance().getGroups()) { activeChar.sendMessage(mobGroup.getGroupId() + ": " + mobGroup.getActiveMobCount() + " alive out of " + mobGroup.getMaxMobCount() + " of NPC ID " + mobGroup.getTemplate().getId() + " (" + mobGroup.getStatus() + ")"); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java index 11c52819e5..636639079c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java @@ -99,9 +99,8 @@ public class ItemAuctionLink implements IBypassHandler } else if ("cancel".equalsIgnoreCase(cmd)) { - final ItemAuction[] auctions = au.getAuctionsByBidder(player.getObjectId()); boolean returned = false; - for (ItemAuction auction : auctions) + for (ItemAuction auction : au.getAuctionsByBidder(player.getObjectId())) { if (auction.cancelBid(player)) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index 7e2471da71..b82ae4a5bd 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -16,6 +16,8 @@ */ package handlers.effecthandlers; +import java.util.List; + import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -84,7 +86,7 @@ public class ConvertItem extends AbstractEffect final int enchantLevel = wpn.getEnchantLevel(); final AttributeHolder elementals = wpn.getAttributes() == null ? null : wpn.getAttackAttribute(); - final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (ItemInstance unequippedItem : unequiped) { @@ -92,10 +94,11 @@ public class ConvertItem extends AbstractEffect } player.sendInventoryUpdate(iu); - if (unequiped.length <= 0) + if (unequiped.isEmpty()) { return; } + byte count = 0; for (ItemInstance unequippedItem : unequiped) { @@ -120,7 +123,7 @@ public class ConvertItem extends AbstractEffect player.sendPacket(sm); } - if (count == unequiped.length) + if (count == unequiped.size()) { return; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index f393955568..5fdd08dd5f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -16,6 +16,7 @@ */ package handlers.effecthandlers; +import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -67,11 +68,11 @@ public class Disarmor extends AbstractEffect } final PlayerInstance player = effected.getActingPlayer(); - final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); - if (unequiped.length > 0) + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); + if (!unequipped.isEmpty()) { final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : unequipped) { iu.addModifiedItem(itm); } @@ -79,20 +80,21 @@ public class Disarmor extends AbstractEffect player.broadcastUserInfo(); SystemMessage sm = null; - if (unequiped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED); - sm.addInt(unequiped[0].getEnchantLevel()); - sm.addItemName(unequiped[0]); + sm.addInt(unequippedItem.getEnchantLevel()); + sm.addItemName(unequippedItem); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); - sm.addItemName(unequiped[0]); + sm.addItemName(unequippedItem); } player.sendPacket(sm); effected.getInventory().blockItemSlot(_slot); - _unequippedItems.put(effected.getObjectId(), unequiped[0].getObjectId()); + _unequippedItems.put(effected.getObjectId(), unequippedItem.getObjectId()); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 19954820bc..119a616831 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -82,7 +82,7 @@ public class ChangeAttributeCrystal implements IItemHandler return false; } - player.sendPacket(new ExChangeAttributeItemList(item.getId(), itemList.toArray(new ItemInfo[itemList.size()]))); + player.sendPacket(new ExChangeAttributeItemList(item.getId(), itemList)); return true; } } \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Recipes.java index 9e13e4dc41..72d0129db1 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Recipes.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Recipes.java @@ -72,13 +72,13 @@ public class Recipes implements IItemHandler { canCraft = player.hasDwarvenCraft(); recipeLevel = (rp.getLevel() > player.getDwarvenCraft()); - recipeLimit = (player.getDwarvenRecipeBook().length >= player.getDwarfRecipeLimit()); + recipeLimit = (player.getDwarvenRecipeBook().size() >= player.getDwarfRecipeLimit()); } else { canCraft = player.hasCommonCraft(); recipeLevel = (rp.getLevel() > player.getCommonCraft()); - recipeLimit = (player.getCommonRecipeBook().length >= player.getCommonRecipeLimit()); + recipeLimit = (player.getCommonRecipeBook().size() >= player.getCommonRecipeLimit()); } if (!canCraft) diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/RecipeController.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/RecipeController.java index 37d4ea9698..ad0d6f053d 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/RecipeController.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/RecipeController.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -89,9 +88,7 @@ public class RecipeController return; } - final List dwarfRecipes = Arrays.asList(manufacturer.getDwarvenRecipeBook()); - final List commonRecipes = Arrays.asList(manufacturer.getCommonRecipeBook()); - if (!dwarfRecipes.contains(recipeList) && !commonRecipes.contains(recipeList)) + if (!manufacturer.getDwarvenRecipeBook().contains(recipeList) && !manufacturer.getCommonRecipeBook().contains(recipeList)) { Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " sent a false recipe id.", Config.DEFAULT_PUNISH); return; @@ -134,9 +131,7 @@ public class RecipeController return; } - final List dwarfRecipes = Arrays.asList(player.getDwarvenRecipeBook()); - final List commonRecipes = Arrays.asList(player.getCommonRecipeBook()); - if (!dwarfRecipes.contains(recipeList) && !commonRecipes.contains(recipeList)) + if (!player.getDwarvenRecipeBook().contains(recipeList) && !player.getCommonRecipeBook().contains(recipeList)) { Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " sent a false recipe id.", Config.DEFAULT_PUNISH); return; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/MacroList.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/MacroList.java index 2411db329d..ead95f13ea 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/MacroList.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/MacroList.java @@ -90,8 +90,7 @@ public class MacroList implements IRestorable deleteMacroFromDb(removed); } - final Shortcut[] allShortCuts = _owner.getAllShortCuts(); - for (Shortcut sc : allShortCuts) + for (Shortcut sc : _owner.getAllShortCuts()) { if ((sc.getId() == id) && (sc.getType() == ShortcutType.MACRO)) { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/MobGroupTable.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/MobGroupTable.java index 244fd07964..e61d726687 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/MobGroupTable.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/MobGroupTable.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.model; +import java.util.Collection; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -67,9 +68,9 @@ public class MobGroupTable return null; } - public MobGroup[] getGroups() + public Collection getGroups() { - return _groupMap.values().toArray(new MobGroup[_groupMap.size()]); + return _groupMap.values(); } public boolean removeGroup(int groupKey) diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ShortCuts.java index 8cf01b5f4f..da9c30d0d0 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; +import java.util.Collection; import java.util.Map; import java.util.TreeMap; import java.util.logging.Level; @@ -46,9 +47,9 @@ public class ShortCuts implements IRestorable _owner = owner; } - public Shortcut[] getAllShortCuts() + public Collection getAllShortCuts() { - return _shortCuts.values().toArray(new Shortcut[_shortCuts.values().size()]); + return _shortCuts.values(); } public Shortcut getShortCut(int slot, int page) diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/TradeList.java index 2ad4b3d9f6..40140ac8f7 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/TradeList.java @@ -105,9 +105,9 @@ public class TradeList /** * @return all items from TradeList */ - public TradeItem[] getItems() + public Collection getItems() { - return _items.toArray(new TradeItem[_items.size()]); + return _items; } /** @@ -857,7 +857,7 @@ public class TradeList final InventoryUpdate playerIU = new InventoryUpdate(); long totalPrice = 0; - final TradeItem[] sellerItems = _items.toArray(new TradeItem[0]); + final TradeItem[] sellerItems = _items.toArray(new TradeItem[_items.size()]); for (ItemRequest item : requestedItems) { // searching item in tradelist using itemId diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index e2ea5fc8a7..21f03ac2f1 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1285,19 +1285,19 @@ public class PlayerInstance extends Playable } /** - * @return a table containing all Common RecipeList of the PlayerInstance. + * @return a collection containing all Common RecipeList of the PlayerInstance. */ - public RecipeList[] getCommonRecipeBook() + public Collection getCommonRecipeBook() { - return _commonRecipeBook.values().toArray(new RecipeList[_commonRecipeBook.values().size()]); + return _commonRecipeBook.values(); } /** - * @return a table containing all Dwarf RecipeList of the PlayerInstance. + * @return a collection containing all Dwarf RecipeList of the PlayerInstance. */ - public RecipeList[] getDwarvenRecipeBook() + public Collection getDwarvenRecipeBook() { - return _dwarvenRecipeBook.values().toArray(new RecipeList[_dwarvenRecipeBook.values().size()]); + return _dwarvenRecipeBook.values(); } /** @@ -1565,9 +1565,9 @@ public class PlayerInstance extends Playable } /** - * @return a table containing all ShortCut of the PlayerInstance. + * @return a collection containing all ShortCut of the PlayerInstance. */ - public Shortcut[] getAllShortCuts() + public Collection getAllShortCuts() { return _shortCuts.getAllShortCuts(); } @@ -2221,7 +2221,7 @@ public class PlayerInstance extends Playable } // Equip or unEquip - ItemInstance[] items = null; + List items = null; final boolean isEquiped = item.isEquipped(); final int oldInvLimit = getInventoryLimit(); SystemMessage sm = null; @@ -2290,7 +2290,7 @@ public class PlayerInstance extends Playable broadcastUserInfo(); final InventoryUpdate iu = new InventoryUpdate(); - iu.addItems(Arrays.asList(items)); + iu.addItems(items); sendInventoryUpdate(iu); if (abortAttack) @@ -5867,9 +5867,9 @@ public class PlayerInstance extends Playable return false; } - final ItemInstance[] unequiped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : unequipped) { iu.addModifiedItem(itm); } @@ -5879,19 +5879,20 @@ public class PlayerInstance extends Playable broadcastUserInfo(); // This can be 0 if the user pressed the right mousebutton twice very fast. - if (unequiped.length > 0) + if (!unequipped.isEmpty()) { final SystemMessage sm; - if (unequiped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED); - sm.addInt(unequiped[0].getEnchantLevel()); - sm.addItemName(unequiped[0]); + sm.addInt(unequippedItem.getEnchantLevel()); + sm.addItemName(unequippedItem); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); - sm.addItemName(unequiped[0]); + sm.addItemName(unequippedItem); } sendPacket(sm); } @@ -5907,9 +5908,9 @@ public class PlayerInstance extends Playable final ItemInstance sld = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (sld != null) { - final ItemInstance[] unequiped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : unequipped) { iu.addModifiedItem(itm); } @@ -5919,19 +5920,20 @@ public class PlayerInstance extends Playable broadcastUserInfo(); // this can be 0 if the user pressed the right mousebutton twice very fast - if (unequiped.length > 0) + if (!unequipped.isEmpty()) { SystemMessage sm = null; - if (unequiped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED); - sm.addInt(unequiped[0].getEnchantLevel()); - sm.addItemName(unequiped[0]); + sm.addInt(unequippedItem.getEnchantLevel()); + sm.addItemName(unequippedItem); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); - sm.addItemName(unequiped[0]); + sm.addItemName(unequippedItem); } sendPacket(sm); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/clan/Clan.java index d76dcec76f..8a0b710671 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -22,6 +22,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -1289,13 +1290,13 @@ public class Clan implements IIdentifiable, INamable /** * @return all the clan skills. */ - public Skill[] getAllSkills() + public Collection getAllSkills() { if (_skills == null) { - return new Skill[0]; + return Collections.emptyList(); } - return _skills.values().toArray(new Skill[_skills.values().size()]); + return _skills.values(); } /** @@ -1830,13 +1831,13 @@ public class Clan implements IIdentifiable, INamable * Used to retrieve all subPledges * @return */ - public SubPledge[] getAllSubPledges() + public Collection getAllSubPledges() { if (_subPledges == null) { - return new SubPledge[0]; + return Collections.emptyList(); } - return _subPledges.values().toArray(new SubPledge[_subPledges.values().size()]); + return _subPledges.values(); } public SubPledge createSubPledge(PlayerInstance player, int pledgeTypeValue, int leaderId, String subPledgeName) @@ -2069,9 +2070,9 @@ public class Clan implements IIdentifiable, INamable /** * @return all RankPrivs. */ - public RankPrivs[] getAllRankPrivs() + public Collection getAllRankPrivs() { - return _privs == null ? new RankPrivs[0] : _privs.values().toArray(new RankPrivs[_privs.values().size()]); + return _privs == null ? Collections.emptyList() : _privs.values(); } public int getLeaderSubPledge(int leaderId) @@ -2931,7 +2932,7 @@ public class Clan implements IIdentifiable, INamable return false; } - public SubPledgeSkill[] getAllSubSkills() + public List getAllSubSkills() { final List list = new LinkedList<>(); for (Skill skill : _subPledgeSkills.values()) @@ -2945,7 +2946,7 @@ public class Clan implements IIdentifiable, INamable list.add(new SubPledgeSkill(subunit.getId(), skill.getId(), skill.getLevel())); } } - return list.toArray(new SubPledgeSkill[list.size()]); + return list; } public void setNewLeaderId(int objectId, boolean storeInDb) diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 8f195b1ba9..8c3f3b5bfd 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -2963,9 +2963,8 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime // Destroy the quantity of items wanted if (item.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(item.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInBodySlotAndRecord(item.getItem().getBodyPart())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index f14581064a..0161150ecb 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -347,7 +347,7 @@ public class ItemAuctionInstance return _auctions.get(auctionId); } - public ItemAuction[] getAuctionsByBidder(int bidderObjId) + public ArrayList getAuctionsByBidder(int bidderObjId) { final Collection auctions = getAuctions(); final ArrayList stack = new ArrayList<>(auctions.size()); @@ -362,7 +362,7 @@ public class ItemAuctionInstance } } } - return stack.toArray(new ItemAuction[stack.size()]); + return stack; } public Collection getAuctions() diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 47360c75df..33e7391d54 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -25,8 +25,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; import java.util.function.Predicate; import java.util.logging.Level; @@ -143,7 +141,7 @@ public abstract class Inventory extends ItemContainer private static final class ChangeRecorder implements PaperdollListener { private final Inventory _inventory; - private final Set _changed = ConcurrentHashMap.newKeySet(); + private final List _changed = new ArrayList<>(1); /** * Constructor of the ChangeRecorder @@ -183,9 +181,9 @@ public abstract class Inventory extends ItemContainer * Returns alterations in inventory * @return ItemInstance[] : array of altered items */ - public ItemInstance[] getChangedItems() + public List getChangedItems() { - return _changed.toArray(new ItemInstance[_changed.size()]); + return _changed; } } @@ -1533,12 +1531,11 @@ public abstract class Inventory extends ItemContainer * Unequips item in body slot and returns alterations.
* If you dont need return value use {@link Inventory#unEquipItemInBodySlot(int)} instead * @param slot : int designating the slot of the paperdoll - * @return ItemInstance[] : list of changes + * @return List : List of changes */ - public ItemInstance[] unEquipItemInBodySlotAndRecord(int slot) + public List unEquipItemInBodySlotAndRecord(int slot) { final ChangeRecorder recorder = newRecorder(); - try { unEquipItemInBodySlot(slot); @@ -1564,12 +1561,11 @@ public abstract class Inventory extends ItemContainer * Unequips item in slot and returns alterations
* If you dont need return value use {@link Inventory#unEquipItemInSlot(int)} instead * @param slot : int designating the slot - * @return ItemInstance[] : list of items altered + * @return List : List of items altered */ - public ItemInstance[] unEquipItemInSlotAndRecord(int slot) + public List unEquipItemInSlotAndRecord(int slot) { final ChangeRecorder recorder = newRecorder(); - try { unEquipItemInSlot(slot); @@ -1737,12 +1733,11 @@ public abstract class Inventory extends ItemContainer * Equips item and returns list of alterations
* If you don't need return value use {@link Inventory#equipItem(ItemInstance)} instead * @param item : ItemInstance corresponding to the item - * @return ItemInstance[] : list of alterations + * @return List : List of alterations */ - public ItemInstance[] equipItemAndRecord(ItemInstance item) + public List equipItemAndRecord(ItemInstance item) { final ChangeRecorder recorder = newRecorder(); - try { equipItem(item); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java index c3b6b052fc..abe6c64915 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -1375,9 +1375,8 @@ public class ItemInstance extends WorldObject // unequip if (isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance item : unequiped) + for (ItemInstance item : player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot())) { iu.addModifiedItem(item); } @@ -1811,9 +1810,8 @@ public class ItemInstance extends WorldObject { if (isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance item : unequiped) + for (ItemInstance item : player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot())) { iu.addModifiedItem(item); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/GameClient.java index 99c66513d8..d42e5bf53a 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/GameClient.java @@ -21,6 +21,7 @@ import java.net.InetSocketAddress; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; +import java.util.List; import java.util.concurrent.locks.ReentrantLock; import java.util.logging.Level; import java.util.logging.Logger; @@ -78,7 +79,7 @@ public class GameClient extends ChannelInboundHandler private PlayerInstance _player; private SecondaryPasswordAuth _secondaryAuth; private ClientHardwareInfoHolder _hardwareInfo; - private CharSelectInfoPackage[] _charSlotMapping = null; + private List _charSlotMapping = null; private volatile boolean _isDetached = false; private boolean _isAuthedGG; private boolean _protocolOk; @@ -568,21 +569,18 @@ public class GameClient extends ChannelInboundHandler return player; } - /** - * @param chars - */ - public void setCharSelection(CharSelectInfoPackage[] chars) + public void setCharSelection(List characters) { - _charSlotMapping = chars; + _charSlotMapping = characters; } public CharSelectInfoPackage getCharSelection(int charslot) { - if ((_charSlotMapping == null) || (charslot < 0) || (charslot >= _charSlotMapping.length)) + if ((_charSlotMapping == null) || (charslot < 0) || (charslot >= _charSlotMapping.size())) { return null; } - return _charSlotMapping[charslot]; + return _charSlotMapping.get(charslot); } public SecondaryPasswordAuth getSecondaryAuth() diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index fc1fe1cfd5..a92a75f977 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -202,9 +202,8 @@ public class RequestCrystallizeItem implements IClientIncomingPacket SystemMessage sm; if (itemToRemove.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance item : unequiped) + for (ItemInstance item : player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot())) { iu.addModifiedItem(item); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index a4accd8a47..0ec5a4d649 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -193,9 +193,8 @@ public class RequestDestroyItem implements IClientIncomingPacket client.sendPacket(sm); } - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 520c45b7ce..ff1d6c6916 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -309,12 +309,10 @@ public class RequestEnchantItem implements IClientIncomingPacket client.sendPacket(sm); } - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot()); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot())) { iu.addModifiedItem(itm); } - player.sendInventoryUpdate(iu); player.broadcastUserInfo(); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java index 730bd1b8f7..2bc2964039 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.clan.Clan.RankPrivs; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.PledgePowerGradeList; @@ -47,8 +46,7 @@ public class RequestPledgePowerGradeList implements IClientIncomingPacket final Clan clan = player.getClan(); if (clan != null) { - final RankPrivs[] privs = clan.getAllRankPrivs(); - player.sendPacket(new PledgePowerGradeList(privs)); + player.sendPacket(new PledgePowerGradeList(clan.getAllRankPrivs())); } } } \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java index 71208c602d..1b039f8cc7 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java @@ -18,9 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.MAX_ADENA; -import java.util.Arrays; -import java.util.List; - import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.RecipeData; @@ -100,14 +97,11 @@ public class RequestRecipeShopListSet implements IClientIncomingPacket return; } - final List dwarfRecipes = Arrays.asList(player.getDwarvenRecipeBook()); - final List commonRecipes = Arrays.asList(player.getCommonRecipeBook()); player.getManufactureItems().clear(); - for (ManufactureItem i : _items) { final RecipeList list = RecipeData.getInstance().getRecipeList(i.getRecipeId()); - if (!dwarfRecipes.contains(list) && !commonRecipes.contains(list)) + if (!player.getDwarvenRecipeBook().contains(list) && !player.getCommonRecipeBook().contains(list)) { Util.handleIllegalPlayerAction(player, "Warning!! Player " + player.getName() + " of account " + player.getAccountName() + " tried to set recipe which he dont have.", Config.DEFAULT_PUNISH); return; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java index 0933d607bd..21176be244 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java @@ -109,8 +109,7 @@ public class RequestRefine extends AbstractRefinePacket final InventoryUpdate iu = new InventoryUpdate(); if (targetItem.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot()); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java index 240322a5da..a420f830b1 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java @@ -92,8 +92,7 @@ public class RequestRefineCancel implements IClientIncomingPacket final InventoryUpdate iu = new InventoryUpdate(); if (targetItem.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot()); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index 77150b7853..5df7fd1754 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.Arrays; +import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.PlayerCondOverride; @@ -99,27 +99,28 @@ public class RequestUnEquipItem implements IClientIncomingPacket return; } - final ItemInstance[] unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); player.broadcastUserInfo(); // This can be 0 if the user pressed the right mouse button twice very fast. - if (unequipped.length > 0) + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); + if (!unequipped.isEmpty()) { SystemMessage sm = null; - if (unequipped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED); - sm.addInt(unequipped[0].getEnchantLevel()); + sm.addInt(unequippedItem.getEnchantLevel()); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); } - sm.addItemName(unequipped[0]); + sm.addItemName(unequippedItem); client.sendPacket(sm); final InventoryUpdate iu = new InventoryUpdate(); - iu.addItems(Arrays.asList(unequipped)); + iu.addItems(unequipped); player.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java index 53048db3ea..9579246e5a 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java @@ -69,7 +69,7 @@ public abstract class AbstractInventoryUpdate extends AbstractItemPacket _items.put(item.getObjectId(), new ItemInfo(item, 3)); } - public void addItems(List items) + public void addItems(Collection items) { for (ItemInstance item : items) { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index db34e27e47..cba9f4f623 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -47,7 +47,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket private final String _loginName; private final int _sessionId; private int _activeId; - private final CharSelectInfoPackage[] _characterPackages; + private final List _characterPackages; private static final int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { @@ -83,7 +83,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket _activeId = activeId; } - public CharSelectInfoPackage[] getCharInfo() + public List getCharInfo() { return _characterPackages; } @@ -93,7 +93,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket { OutgoingPackets.CHARACTER_SELECTION_INFO.writeId(packet); - final int size = _characterPackages.length; + final int size = _characterPackages.size(); packet.writeD(size); // Created character count packet.writeD(Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT); // Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) ) @@ -107,9 +107,9 @@ public class CharSelectionInfo implements IClientOutgoingPacket { for (int i = 0; i < size; i++) { - if (lastAccess < _characterPackages[i].getLastAccess()) + if (lastAccess < _characterPackages.get(i).getLastAccess()) { - lastAccess = _characterPackages[i].getLastAccess(); + lastAccess = _characterPackages.get(i).getLastAccess(); _activeId = i; } } @@ -117,7 +117,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket for (int i = 0; i < size; i++) { - final CharSelectInfoPackage charInfoPackage = _characterPackages[i]; + final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i); packet.writeS(charInfoPackage.getName()); // Character name packet.writeD(charInfoPackage.getObjectId()); // Character ID packet.writeS(_loginName); // Account name @@ -218,7 +218,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket return true; } - private static CharSelectInfoPackage[] loadCharacterSelectInfo(String loginName) + private static List loadCharacterSelectInfo(String loginName) { CharSelectInfoPackage charInfopackage; final List characterList = new LinkedList<>(); @@ -244,13 +244,13 @@ public class CharSelectionInfo implements IClientOutgoingPacket } } } - return characterList.toArray(new CharSelectInfoPackage[characterList.size()]); } catch (Exception e) { LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } - return new CharSelectInfoPackage[0]; + + return characterList; } private static void loadCharacterSubclassInfo(CharSelectInfoPackage charInfopackage, int objectId, int activeClassId) diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java index 20d42578b2..4ae5ffe316 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.clan.Clan; @@ -39,12 +41,12 @@ public class ExPledgeRecruitInfo implements IClientOutgoingPacket { OutgoingPackets.EX_PLEDGE_RECRUIT_INFO.writeId(packet); - final SubPledge[] subPledges = _clan.getAllSubPledges(); + final Collection subPledges = _clan.getAllSubPledges(); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); packet.writeD(_clan.getLevel()); packet.writeD(_clan.getMembersCount()); - packet.writeD(subPledges.length); + packet.writeD(subPledges.size()); for (SubPledge subPledge : subPledges) { packet.writeD(subPledge.getId()); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java index cb2e18edb9..fce9f86d25 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java @@ -16,15 +16,17 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan.RankPrivs; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PledgePowerGradeList implements IClientOutgoingPacket { - private final RankPrivs[] _privs; + private final Collection _privs; - public PledgePowerGradeList(RankPrivs[] privs) + public PledgePowerGradeList(Collection privs) { _privs = privs; } @@ -33,8 +35,7 @@ public class PledgePowerGradeList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_POWER_GRADE_LIST.writeId(packet); - - packet.writeD(_privs.length); + packet.writeD(_privs.size()); for (RankPrivs temp : _privs) { packet.writeD(temp.getRank()); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java index eab507b686..591ab8690a 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java @@ -16,6 +16,9 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; +import java.util.List; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.skills.Skill; @@ -26,8 +29,8 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class PledgeSkillList implements IClientOutgoingPacket { - private final Skill[] _skills; - private final SubPledgeSkill[] _subSkills; + private final Collection _skills; + private final List _subSkills; public static class SubPledgeSkill { @@ -53,9 +56,8 @@ public class PledgeSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SKILL_LIST.writeId(packet); - - packet.writeD(_skills.length); - packet.writeD(_subSkills.length); // Squad skill length + packet.writeD(_skills.size()); + packet.writeD(_subSkills.size()); // Squad skill length for (Skill sk : _skills) { packet.writeD(sk.getDisplayId()); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java index 88a45c71fc..38f43a3fe0 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java @@ -48,7 +48,7 @@ public class PrivateStoreListSell extends AbstractItemPacket packet.writeD(_seller.getSellList().isPackaged() ? 1 : 0); packet.writeQ(_player.getAdena()); packet.writeD(0x00); - packet.writeD(_seller.getSellList().getItems().length); + packet.writeD(_seller.getSellList().getItems().size()); for (TradeItem item : _seller.getSellList().getItems()) { writeItem(packet, item); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index 4d008a0373..2e24347ed8 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -29,7 +29,7 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket private final int _objId; private final long _playerAdena; private final Collection _itemList; - private final TradeItem[] _buyList; + private final Collection _buyList; public PrivateStoreManageListBuy(PlayerInstance player) { @@ -54,7 +54,7 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(_buyList.length); // count for all items already added for buy + packet.writeD(_buyList.size()); // count for all items already added for buy for (TradeItem item : _buyList) { writeItem(packet, item); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java index c9a83efd9e..a3ccdb4605 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java @@ -29,7 +29,7 @@ public class PrivateStoreManageListSell extends AbstractItemPacket private final long _playerAdena; private final boolean _packageSale; private final Collection _itemList; - private final TradeItem[] _sellList; + private final Collection _sellList; public PrivateStoreManageListSell(PlayerInstance player, boolean isPackageSale) { @@ -57,7 +57,7 @@ public class PrivateStoreManageListSell extends AbstractItemPacket packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(_sellList.length); // count for any items already added for sell + packet.writeD(_sellList.size()); // count for any items already added for sell for (TradeItem item : _sellList) { writeItem(packet, item); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java index 67d9ba4762..3918894601 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java @@ -16,13 +16,15 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.network.OutgoingPackets; public class RecipeBookItemList implements IClientOutgoingPacket { - private RecipeList[] _recipes; + private Collection _recipes; private final boolean _isDwarvenCraft; private final int _maxMp; @@ -32,7 +34,7 @@ public class RecipeBookItemList implements IClientOutgoingPacket _maxMp = maxMp; } - public void addRecipes(RecipeList[] recipeBook) + public void addRecipes(Collection recipeBook) { _recipes = recipeBook; } @@ -51,11 +53,13 @@ public class RecipeBookItemList implements IClientOutgoingPacket } else { - packet.writeD(_recipes.length); // number of items in recipe book - for (int i = 0; i < _recipes.length; i++) + packet.writeD(_recipes.size()); // number of items in recipe book + int count = 0; + for (RecipeList recipe : _recipes) { - packet.writeD(_recipes[i].getId()); - packet.writeD(i + 1); + count++; + packet.writeD(recipe.getId()); + packet.writeD(count); } } return true; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java index e7b2df947d..8939863a30 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; import java.util.Iterator; import org.l2jmobius.commons.network.PacketWriter; @@ -28,7 +29,7 @@ public class RecipeShopManageList implements IClientOutgoingPacket { private final PlayerInstance _seller; private final boolean _isDwarven; - private RecipeList[] _recipes; + private Collection _recipes; public RecipeShopManageList(PlayerInstance seller, boolean isDwarven) { @@ -73,13 +74,13 @@ public class RecipeShopManageList implements IClientOutgoingPacket } else { - packet.writeD(_recipes.length); // number of items in recipe book - - for (int i = 0; i < _recipes.length; i++) + packet.writeD(_recipes.size()); // number of items in recipe book + int count = 0; + for (RecipeList recipe : _recipes) { - final RecipeList temp = _recipes[i]; - packet.writeD(temp.getId()); - packet.writeD(i + 1); + count++; + packet.writeD(recipe.getId()); + packet.writeD(count); } } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java index 5bb5356fd0..e7a3655f52 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -23,7 +25,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ShortCutInit implements IClientOutgoingPacket { - private Shortcut[] _shortCuts; + private Collection _shortCuts; public ShortCutInit(PlayerInstance player) { @@ -40,7 +42,7 @@ public class ShortCutInit implements IClientOutgoingPacket { OutgoingPackets.SHORT_CUT_INIT.writeId(packet); - packet.writeD(_shortCuts.length); + packet.writeD(_shortCuts.size()); for (Shortcut sc : _shortCuts) { packet.writeD(sc.getType().ordinal()); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java index 7e32d855fe..bfb530ca83 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets.attributechange; +import java.util.List; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -26,13 +28,13 @@ import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket; */ public class ExChangeAttributeItemList extends AbstractItemPacket { - private final ItemInfo[] _itemsList; + private final List _itemsList; private final int _itemId; - public ExChangeAttributeItemList(int itemId, ItemInfo[] itemsList) + public ExChangeAttributeItemList(int itemId, List itemList) { _itemId = itemId; - _itemsList = itemsList; + _itemsList = itemList; } @Override @@ -40,7 +42,7 @@ public class ExChangeAttributeItemList extends AbstractItemPacket { OutgoingPackets.EX_CHANGE_ATTRIBUTE_ITEM_LIST.writeId(packet); packet.writeD(_itemId); - packet.writeD(_itemsList.length); + packet.writeD(_itemsList.size()); for (ItemInfo item : _itemsList) { writeItem(packet, item); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java index 771c0e3848..a34595ca73 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java @@ -594,9 +594,8 @@ public class AdminMobGroup implements IAdminCommandHandler private void showGroupList(PlayerInstance activeChar) { - final MobGroup[] mobGroupList = MobGroupTable.getInstance().getGroups(); BuilderUtil.sendSysMessage(activeChar, "======= ======="); - for (MobGroup mobGroup : mobGroupList) + for (MobGroup mobGroup : MobGroupTable.getInstance().getGroups()) { activeChar.sendMessage(mobGroup.getGroupId() + ": " + mobGroup.getActiveMobCount() + " alive out of " + mobGroup.getMaxMobCount() + " of NPC ID " + mobGroup.getTemplate().getId() + " (" + mobGroup.getStatus() + ")"); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java index 11c52819e5..636639079c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java @@ -99,9 +99,8 @@ public class ItemAuctionLink implements IBypassHandler } else if ("cancel".equalsIgnoreCase(cmd)) { - final ItemAuction[] auctions = au.getAuctionsByBidder(player.getObjectId()); boolean returned = false; - for (ItemAuction auction : auctions) + for (ItemAuction auction : au.getAuctionsByBidder(player.getObjectId())) { if (auction.cancelBid(player)) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index 7e2471da71..b82ae4a5bd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -16,6 +16,8 @@ */ package handlers.effecthandlers; +import java.util.List; + import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -84,7 +86,7 @@ public class ConvertItem extends AbstractEffect final int enchantLevel = wpn.getEnchantLevel(); final AttributeHolder elementals = wpn.getAttributes() == null ? null : wpn.getAttackAttribute(); - final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (ItemInstance unequippedItem : unequiped) { @@ -92,10 +94,11 @@ public class ConvertItem extends AbstractEffect } player.sendInventoryUpdate(iu); - if (unequiped.length <= 0) + if (unequiped.isEmpty()) { return; } + byte count = 0; for (ItemInstance unequippedItem : unequiped) { @@ -120,7 +123,7 @@ public class ConvertItem extends AbstractEffect player.sendPacket(sm); } - if (count == unequiped.length) + if (count == unequiped.size()) { return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index f393955568..5fdd08dd5f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -16,6 +16,7 @@ */ package handlers.effecthandlers; +import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -67,11 +68,11 @@ public class Disarmor extends AbstractEffect } final PlayerInstance player = effected.getActingPlayer(); - final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); - if (unequiped.length > 0) + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); + if (!unequipped.isEmpty()) { final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : unequipped) { iu.addModifiedItem(itm); } @@ -79,20 +80,21 @@ public class Disarmor extends AbstractEffect player.broadcastUserInfo(); SystemMessage sm = null; - if (unequiped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED); - sm.addInt(unequiped[0].getEnchantLevel()); - sm.addItemName(unequiped[0]); + sm.addInt(unequippedItem.getEnchantLevel()); + sm.addItemName(unequippedItem); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); - sm.addItemName(unequiped[0]); + sm.addItemName(unequippedItem); } player.sendPacket(sm); effected.getInventory().blockItemSlot(_slot); - _unequippedItems.put(effected.getObjectId(), unequiped[0].getObjectId()); + _unequippedItems.put(effected.getObjectId(), unequippedItem.getObjectId()); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 19954820bc..119a616831 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -82,7 +82,7 @@ public class ChangeAttributeCrystal implements IItemHandler return false; } - player.sendPacket(new ExChangeAttributeItemList(item.getId(), itemList.toArray(new ItemInfo[itemList.size()]))); + player.sendPacket(new ExChangeAttributeItemList(item.getId(), itemList)); return true; } } \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/MacroList.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/MacroList.java index 2411db329d..ead95f13ea 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/MacroList.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/MacroList.java @@ -90,8 +90,7 @@ public class MacroList implements IRestorable deleteMacroFromDb(removed); } - final Shortcut[] allShortCuts = _owner.getAllShortCuts(); - for (Shortcut sc : allShortCuts) + for (Shortcut sc : _owner.getAllShortCuts()) { if ((sc.getId() == id) && (sc.getType() == ShortcutType.MACRO)) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/MobGroupTable.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/MobGroupTable.java index 244fd07964..e61d726687 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/MobGroupTable.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/MobGroupTable.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.model; +import java.util.Collection; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -67,9 +68,9 @@ public class MobGroupTable return null; } - public MobGroup[] getGroups() + public Collection getGroups() { - return _groupMap.values().toArray(new MobGroup[_groupMap.size()]); + return _groupMap.values(); } public boolean removeGroup(int groupKey) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ShortCuts.java index 8cf01b5f4f..da9c30d0d0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; +import java.util.Collection; import java.util.Map; import java.util.TreeMap; import java.util.logging.Level; @@ -46,9 +47,9 @@ public class ShortCuts implements IRestorable _owner = owner; } - public Shortcut[] getAllShortCuts() + public Collection getAllShortCuts() { - return _shortCuts.values().toArray(new Shortcut[_shortCuts.values().size()]); + return _shortCuts.values(); } public Shortcut getShortCut(int slot, int page) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TradeList.java index 13b48f594c..7224ffc3ee 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TradeList.java @@ -107,9 +107,9 @@ public class TradeList /** * @return all items from TradeList */ - public TradeItem[] getItems() + public Collection getItems() { - return _items.toArray(new TradeItem[_items.size()]); + return _items; } /** @@ -863,7 +863,7 @@ public class TradeList final InventoryUpdate playerIU = new InventoryUpdate(); long totalPrice = 0; - final TradeItem[] sellerItems = _items.toArray(new TradeItem[0]); + final TradeItem[] sellerItems = _items.toArray(new TradeItem[_items.size()]); for (ItemRequest item : requestedItems) { // searching item in tradelist using itemId diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 415a2291f0..cad7fd6051 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1575,9 +1575,9 @@ public class PlayerInstance extends Playable } /** - * @return a table containing all ShortCut of the PlayerInstance. + * @return a collection containing all ShortCut of the PlayerInstance. */ - public Shortcut[] getAllShortCuts() + public Collection getAllShortCuts() { return _shortCuts.getAllShortCuts(); } @@ -2228,7 +2228,7 @@ public class PlayerInstance extends Playable } // Equip or unEquip - ItemInstance[] items = null; + List items = null; final boolean isEquiped = item.isEquipped(); final int oldInvLimit = getInventoryLimit(); SystemMessage sm = null; @@ -2298,7 +2298,7 @@ public class PlayerInstance extends Playable broadcastUserInfo(); final InventoryUpdate iu = new InventoryUpdate(); - iu.addItems(Arrays.asList(items)); + iu.addItems(items); sendInventoryUpdate(iu); if (abortAttack) @@ -5862,9 +5862,9 @@ public class PlayerInstance extends Playable return false; } - final ItemInstance[] unequiped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : unequipped) { iu.addModifiedItem(itm); } @@ -5874,19 +5874,20 @@ public class PlayerInstance extends Playable broadcastUserInfo(); // This can be 0 if the user pressed the right mousebutton twice very fast. - if (unequiped.length > 0) + if (!unequipped.isEmpty()) { final SystemMessage sm; - if (unequiped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED); - sm.addInt(unequiped[0].getEnchantLevel()); - sm.addItemName(unequiped[0]); + sm.addInt(unequippedItem.getEnchantLevel()); + sm.addItemName(unequippedItem); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); - sm.addItemName(unequiped[0]); + sm.addItemName(unequippedItem); } sendPacket(sm); } @@ -5902,9 +5903,9 @@ public class PlayerInstance extends Playable final ItemInstance sld = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (sld != null) { - final ItemInstance[] unequiped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : unequipped) { iu.addModifiedItem(itm); } @@ -5914,19 +5915,20 @@ public class PlayerInstance extends Playable broadcastUserInfo(); // this can be 0 if the user pressed the right mousebutton twice very fast - if (unequiped.length > 0) + if (!unequipped.isEmpty()) { SystemMessage sm = null; - if (unequiped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED); - sm.addInt(unequiped[0].getEnchantLevel()); - sm.addItemName(unequiped[0]); + sm.addInt(unequippedItem.getEnchantLevel()); + sm.addItemName(unequippedItem); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); - sm.addItemName(unequiped[0]); + sm.addItemName(unequippedItem); } sendPacket(sm); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clan/Clan.java index d76dcec76f..8a0b710671 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -22,6 +22,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -1289,13 +1290,13 @@ public class Clan implements IIdentifiable, INamable /** * @return all the clan skills. */ - public Skill[] getAllSkills() + public Collection getAllSkills() { if (_skills == null) { - return new Skill[0]; + return Collections.emptyList(); } - return _skills.values().toArray(new Skill[_skills.values().size()]); + return _skills.values(); } /** @@ -1830,13 +1831,13 @@ public class Clan implements IIdentifiable, INamable * Used to retrieve all subPledges * @return */ - public SubPledge[] getAllSubPledges() + public Collection getAllSubPledges() { if (_subPledges == null) { - return new SubPledge[0]; + return Collections.emptyList(); } - return _subPledges.values().toArray(new SubPledge[_subPledges.values().size()]); + return _subPledges.values(); } public SubPledge createSubPledge(PlayerInstance player, int pledgeTypeValue, int leaderId, String subPledgeName) @@ -2069,9 +2070,9 @@ public class Clan implements IIdentifiable, INamable /** * @return all RankPrivs. */ - public RankPrivs[] getAllRankPrivs() + public Collection getAllRankPrivs() { - return _privs == null ? new RankPrivs[0] : _privs.values().toArray(new RankPrivs[_privs.values().size()]); + return _privs == null ? Collections.emptyList() : _privs.values(); } public int getLeaderSubPledge(int leaderId) @@ -2931,7 +2932,7 @@ public class Clan implements IIdentifiable, INamable return false; } - public SubPledgeSkill[] getAllSubSkills() + public List getAllSubSkills() { final List list = new LinkedList<>(); for (Skill skill : _subPledgeSkills.values()) @@ -2945,7 +2946,7 @@ public class Clan implements IIdentifiable, INamable list.add(new SubPledgeSkill(subunit.getId(), skill.getId(), skill.getLevel())); } } - return list.toArray(new SubPledgeSkill[list.size()]); + return list; } public void setNewLeaderId(int objectId, boolean storeInDb) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 8f195b1ba9..8c3f3b5bfd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -2963,9 +2963,8 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime // Destroy the quantity of items wanted if (item.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(item.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInBodySlotAndRecord(item.getItem().getBodyPart())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index f14581064a..0161150ecb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -347,7 +347,7 @@ public class ItemAuctionInstance return _auctions.get(auctionId); } - public ItemAuction[] getAuctionsByBidder(int bidderObjId) + public ArrayList getAuctionsByBidder(int bidderObjId) { final Collection auctions = getAuctions(); final ArrayList stack = new ArrayList<>(auctions.size()); @@ -362,7 +362,7 @@ public class ItemAuctionInstance } } } - return stack.toArray(new ItemAuction[stack.size()]); + return stack; } public Collection getAuctions() diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 479bc56509..21a73ce2df 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -25,8 +25,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; import java.util.function.Predicate; import java.util.logging.Level; @@ -143,7 +141,7 @@ public abstract class Inventory extends ItemContainer private static final class ChangeRecorder implements PaperdollListener { private final Inventory _inventory; - private final Set _changed = ConcurrentHashMap.newKeySet(); + private final List _changed = new ArrayList<>(1); /** * Constructor of the ChangeRecorder @@ -183,9 +181,9 @@ public abstract class Inventory extends ItemContainer * Returns alterations in inventory * @return ItemInstance[] : array of altered items */ - public ItemInstance[] getChangedItems() + public List getChangedItems() { - return _changed.toArray(new ItemInstance[_changed.size()]); + return _changed; } } @@ -1533,12 +1531,11 @@ public abstract class Inventory extends ItemContainer * Unequips item in body slot and returns alterations.
* If you dont need return value use {@link Inventory#unEquipItemInBodySlot(int)} instead * @param slot : int designating the slot of the paperdoll - * @return ItemInstance[] : list of changes + * @return List : List of changes */ - public ItemInstance[] unEquipItemInBodySlotAndRecord(int slot) + public List unEquipItemInBodySlotAndRecord(int slot) { final ChangeRecorder recorder = newRecorder(); - try { unEquipItemInBodySlot(slot); @@ -1564,12 +1561,11 @@ public abstract class Inventory extends ItemContainer * Unequips item in slot and returns alterations
* If you dont need return value use {@link Inventory#unEquipItemInSlot(int)} instead * @param slot : int designating the slot - * @return ItemInstance[] : list of items altered + * @return List : List of items altered */ - public ItemInstance[] unEquipItemInSlotAndRecord(int slot) + public List unEquipItemInSlotAndRecord(int slot) { final ChangeRecorder recorder = newRecorder(); - try { unEquipItemInSlot(slot); @@ -1737,12 +1733,11 @@ public abstract class Inventory extends ItemContainer * Equips item and returns list of alterations
* If you don't need return value use {@link Inventory#equipItem(ItemInstance)} instead * @param item : ItemInstance corresponding to the item - * @return ItemInstance[] : list of alterations + * @return List : List of alterations */ - public ItemInstance[] equipItemAndRecord(ItemInstance item) + public List equipItemAndRecord(ItemInstance item) { final ChangeRecorder recorder = newRecorder(); - try { equipItem(item); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java index 9b0c7059f1..73ad216a85 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -1375,9 +1375,8 @@ public class ItemInstance extends WorldObject // unequip if (isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance item : unequiped) + for (ItemInstance item : player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot())) { iu.addModifiedItem(item); } @@ -1811,9 +1810,8 @@ public class ItemInstance extends WorldObject { if (isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance item : unequiped) + for (ItemInstance item : player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot())) { iu.addModifiedItem(item); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/GameClient.java index 99c66513d8..d42e5bf53a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/GameClient.java @@ -21,6 +21,7 @@ import java.net.InetSocketAddress; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; +import java.util.List; import java.util.concurrent.locks.ReentrantLock; import java.util.logging.Level; import java.util.logging.Logger; @@ -78,7 +79,7 @@ public class GameClient extends ChannelInboundHandler private PlayerInstance _player; private SecondaryPasswordAuth _secondaryAuth; private ClientHardwareInfoHolder _hardwareInfo; - private CharSelectInfoPackage[] _charSlotMapping = null; + private List _charSlotMapping = null; private volatile boolean _isDetached = false; private boolean _isAuthedGG; private boolean _protocolOk; @@ -568,21 +569,18 @@ public class GameClient extends ChannelInboundHandler return player; } - /** - * @param chars - */ - public void setCharSelection(CharSelectInfoPackage[] chars) + public void setCharSelection(List characters) { - _charSlotMapping = chars; + _charSlotMapping = characters; } public CharSelectInfoPackage getCharSelection(int charslot) { - if ((_charSlotMapping == null) || (charslot < 0) || (charslot >= _charSlotMapping.length)) + if ((_charSlotMapping == null) || (charslot < 0) || (charslot >= _charSlotMapping.size())) { return null; } - return _charSlotMapping[charslot]; + return _charSlotMapping.get(charslot); } public SecondaryPasswordAuth getSecondaryAuth() diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index fc1fe1cfd5..a92a75f977 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -202,9 +202,8 @@ public class RequestCrystallizeItem implements IClientIncomingPacket SystemMessage sm; if (itemToRemove.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance item : unequiped) + for (ItemInstance item : player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot())) { iu.addModifiedItem(item); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index a4accd8a47..0ec5a4d649 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -193,9 +193,8 @@ public class RequestDestroyItem implements IClientIncomingPacket client.sendPacket(sm); } - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 520c45b7ce..ff1d6c6916 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -309,12 +309,10 @@ public class RequestEnchantItem implements IClientIncomingPacket client.sendPacket(sm); } - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot()); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot())) { iu.addModifiedItem(itm); } - player.sendInventoryUpdate(iu); player.broadcastUserInfo(); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java index 730bd1b8f7..2bc2964039 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.clan.Clan.RankPrivs; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.PledgePowerGradeList; @@ -47,8 +46,7 @@ public class RequestPledgePowerGradeList implements IClientIncomingPacket final Clan clan = player.getClan(); if (clan != null) { - final RankPrivs[] privs = clan.getAllRankPrivs(); - player.sendPacket(new PledgePowerGradeList(privs)); + player.sendPacket(new PledgePowerGradeList(clan.getAllRankPrivs())); } } } \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java index 0933d607bd..21176be244 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java @@ -109,8 +109,7 @@ public class RequestRefine extends AbstractRefinePacket final InventoryUpdate iu = new InventoryUpdate(); if (targetItem.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot()); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java index 240322a5da..a420f830b1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java @@ -92,8 +92,7 @@ public class RequestRefineCancel implements IClientIncomingPacket final InventoryUpdate iu = new InventoryUpdate(); if (targetItem.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot()); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index 77150b7853..5df7fd1754 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.Arrays; +import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.PlayerCondOverride; @@ -99,27 +99,28 @@ public class RequestUnEquipItem implements IClientIncomingPacket return; } - final ItemInstance[] unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); player.broadcastUserInfo(); // This can be 0 if the user pressed the right mouse button twice very fast. - if (unequipped.length > 0) + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); + if (!unequipped.isEmpty()) { SystemMessage sm = null; - if (unequipped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED); - sm.addInt(unequipped[0].getEnchantLevel()); + sm.addInt(unequippedItem.getEnchantLevel()); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); } - sm.addItemName(unequipped[0]); + sm.addItemName(unequippedItem); client.sendPacket(sm); final InventoryUpdate iu = new InventoryUpdate(); - iu.addItems(Arrays.asList(unequipped)); + iu.addItems(unequipped); player.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java index 53048db3ea..9579246e5a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java @@ -69,7 +69,7 @@ public abstract class AbstractInventoryUpdate extends AbstractItemPacket _items.put(item.getObjectId(), new ItemInfo(item, 3)); } - public void addItems(List items) + public void addItems(Collection items) { for (ItemInstance item : items) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 41d702f6be..17e067dd75 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -47,7 +47,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket private final String _loginName; private final int _sessionId; private int _activeId; - private final CharSelectInfoPackage[] _characterPackages; + private final List _characterPackages; private static final int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { @@ -83,7 +83,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket _activeId = activeId; } - public CharSelectInfoPackage[] getCharInfo() + public List getCharInfo() { return _characterPackages; } @@ -93,7 +93,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket { OutgoingPackets.CHARACTER_SELECTION_INFO.writeId(packet); - final int size = _characterPackages.length; + final int size = _characterPackages.size(); packet.writeD(size); // Created character count packet.writeD(Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT); // Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) ) @@ -107,9 +107,9 @@ public class CharSelectionInfo implements IClientOutgoingPacket { for (int i = 0; i < size; i++) { - if (lastAccess < _characterPackages[i].getLastAccess()) + if (lastAccess < _characterPackages.get(i).getLastAccess()) { - lastAccess = _characterPackages[i].getLastAccess(); + lastAccess = _characterPackages.get(i).getLastAccess(); _activeId = i; } } @@ -117,7 +117,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket for (int i = 0; i < size; i++) { - final CharSelectInfoPackage charInfoPackage = _characterPackages[i]; + final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i); packet.writeS(charInfoPackage.getName()); // Character name packet.writeD(charInfoPackage.getObjectId()); // Character ID packet.writeS(_loginName); // Account name @@ -218,7 +218,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket return true; } - private static CharSelectInfoPackage[] loadCharacterSelectInfo(String loginName) + private static List loadCharacterSelectInfo(String loginName) { CharSelectInfoPackage charInfopackage; final List characterList = new LinkedList<>(); @@ -244,13 +244,13 @@ public class CharSelectionInfo implements IClientOutgoingPacket } } } - return characterList.toArray(new CharSelectInfoPackage[characterList.size()]); } catch (Exception e) { LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } - return new CharSelectInfoPackage[0]; + + return characterList; } private static void loadCharacterSubclassInfo(CharSelectInfoPackage charInfopackage, int objectId, int activeClassId) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java index 20d42578b2..4ae5ffe316 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.clan.Clan; @@ -39,12 +41,12 @@ public class ExPledgeRecruitInfo implements IClientOutgoingPacket { OutgoingPackets.EX_PLEDGE_RECRUIT_INFO.writeId(packet); - final SubPledge[] subPledges = _clan.getAllSubPledges(); + final Collection subPledges = _clan.getAllSubPledges(); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); packet.writeD(_clan.getLevel()); packet.writeD(_clan.getMembersCount()); - packet.writeD(subPledges.length); + packet.writeD(subPledges.size()); for (SubPledge subPledge : subPledges) { packet.writeD(subPledge.getId()); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java index cb2e18edb9..fce9f86d25 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java @@ -16,15 +16,17 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan.RankPrivs; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PledgePowerGradeList implements IClientOutgoingPacket { - private final RankPrivs[] _privs; + private final Collection _privs; - public PledgePowerGradeList(RankPrivs[] privs) + public PledgePowerGradeList(Collection privs) { _privs = privs; } @@ -33,8 +35,7 @@ public class PledgePowerGradeList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_POWER_GRADE_LIST.writeId(packet); - - packet.writeD(_privs.length); + packet.writeD(_privs.size()); for (RankPrivs temp : _privs) { packet.writeD(temp.getRank()); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java index eab507b686..591ab8690a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java @@ -16,6 +16,9 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; +import java.util.List; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.skills.Skill; @@ -26,8 +29,8 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class PledgeSkillList implements IClientOutgoingPacket { - private final Skill[] _skills; - private final SubPledgeSkill[] _subSkills; + private final Collection _skills; + private final List _subSkills; public static class SubPledgeSkill { @@ -53,9 +56,8 @@ public class PledgeSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SKILL_LIST.writeId(packet); - - packet.writeD(_skills.length); - packet.writeD(_subSkills.length); // Squad skill length + packet.writeD(_skills.size()); + packet.writeD(_subSkills.size()); // Squad skill length for (Skill sk : _skills) { packet.writeD(sk.getDisplayId()); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java index 88a45c71fc..38f43a3fe0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java @@ -48,7 +48,7 @@ public class PrivateStoreListSell extends AbstractItemPacket packet.writeD(_seller.getSellList().isPackaged() ? 1 : 0); packet.writeQ(_player.getAdena()); packet.writeD(0x00); - packet.writeD(_seller.getSellList().getItems().length); + packet.writeD(_seller.getSellList().getItems().size()); for (TradeItem item : _seller.getSellList().getItems()) { writeItem(packet, item); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index 4d008a0373..2e24347ed8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -29,7 +29,7 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket private final int _objId; private final long _playerAdena; private final Collection _itemList; - private final TradeItem[] _buyList; + private final Collection _buyList; public PrivateStoreManageListBuy(PlayerInstance player) { @@ -54,7 +54,7 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(_buyList.length); // count for all items already added for buy + packet.writeD(_buyList.size()); // count for all items already added for buy for (TradeItem item : _buyList) { writeItem(packet, item); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java index c9a83efd9e..a3ccdb4605 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java @@ -29,7 +29,7 @@ public class PrivateStoreManageListSell extends AbstractItemPacket private final long _playerAdena; private final boolean _packageSale; private final Collection _itemList; - private final TradeItem[] _sellList; + private final Collection _sellList; public PrivateStoreManageListSell(PlayerInstance player, boolean isPackageSale) { @@ -57,7 +57,7 @@ public class PrivateStoreManageListSell extends AbstractItemPacket packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(_sellList.length); // count for any items already added for sell + packet.writeD(_sellList.size()); // count for any items already added for sell for (TradeItem item : _sellList) { writeItem(packet, item); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java index 5bb5356fd0..e7a3655f52 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -23,7 +25,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ShortCutInit implements IClientOutgoingPacket { - private Shortcut[] _shortCuts; + private Collection _shortCuts; public ShortCutInit(PlayerInstance player) { @@ -40,7 +42,7 @@ public class ShortCutInit implements IClientOutgoingPacket { OutgoingPackets.SHORT_CUT_INIT.writeId(packet); - packet.writeD(_shortCuts.length); + packet.writeD(_shortCuts.size()); for (Shortcut sc : _shortCuts) { packet.writeD(sc.getType().ordinal()); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java index 7e32d855fe..bfb530ca83 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets.attributechange; +import java.util.List; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -26,13 +28,13 @@ import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket; */ public class ExChangeAttributeItemList extends AbstractItemPacket { - private final ItemInfo[] _itemsList; + private final List _itemsList; private final int _itemId; - public ExChangeAttributeItemList(int itemId, ItemInfo[] itemsList) + public ExChangeAttributeItemList(int itemId, List itemList) { _itemId = itemId; - _itemsList = itemsList; + _itemsList = itemList; } @Override @@ -40,7 +42,7 @@ public class ExChangeAttributeItemList extends AbstractItemPacket { OutgoingPackets.EX_CHANGE_ATTRIBUTE_ITEM_LIST.writeId(packet); packet.writeD(_itemId); - packet.writeD(_itemsList.length); + packet.writeD(_itemsList.size()); for (ItemInfo item : _itemsList) { writeItem(packet, item); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java index 771c0e3848..a34595ca73 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java @@ -594,9 +594,8 @@ public class AdminMobGroup implements IAdminCommandHandler private void showGroupList(PlayerInstance activeChar) { - final MobGroup[] mobGroupList = MobGroupTable.getInstance().getGroups(); BuilderUtil.sendSysMessage(activeChar, "======= ======="); - for (MobGroup mobGroup : mobGroupList) + for (MobGroup mobGroup : MobGroupTable.getInstance().getGroups()) { activeChar.sendMessage(mobGroup.getGroupId() + ": " + mobGroup.getActiveMobCount() + " alive out of " + mobGroup.getMaxMobCount() + " of NPC ID " + mobGroup.getTemplate().getId() + " (" + mobGroup.getStatus() + ")"); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java index 11c52819e5..636639079c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java @@ -99,9 +99,8 @@ public class ItemAuctionLink implements IBypassHandler } else if ("cancel".equalsIgnoreCase(cmd)) { - final ItemAuction[] auctions = au.getAuctionsByBidder(player.getObjectId()); boolean returned = false; - for (ItemAuction auction : auctions) + for (ItemAuction auction : au.getAuctionsByBidder(player.getObjectId())) { if (auction.cancelBid(player)) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index 88740dea9e..4796533f47 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -16,6 +16,8 @@ */ package handlers.effecthandlers; +import java.util.List; + import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -84,7 +86,7 @@ public class ConvertItem extends AbstractEffect final int enchantLevel = wpn.getEnchantLevel(); final AttributeHolder elementals = wpn.getAttributes() == null ? null : wpn.getAttackAttribute(); - final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (ItemInstance unequippedItem : unequiped) { @@ -92,10 +94,11 @@ public class ConvertItem extends AbstractEffect } player.sendInventoryUpdate(iu); - if (unequiped.length <= 0) + if (unequiped.isEmpty()) { return; } + byte count = 0; for (ItemInstance unequippedItem : unequiped) { @@ -120,7 +123,7 @@ public class ConvertItem extends AbstractEffect player.sendPacket(sm); } - if (count == unequiped.length) + if (count == unequiped.size()) { return; } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index f0c25bcfbf..3fb226310b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -16,6 +16,7 @@ */ package handlers.effecthandlers; +import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -67,11 +68,11 @@ public class Disarmor extends AbstractEffect } final PlayerInstance player = effected.getActingPlayer(); - final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); - if (unequiped.length > 0) + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); + if (!unequipped.isEmpty()) { final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : unequipped) { iu.addModifiedItem(itm); } @@ -79,20 +80,21 @@ public class Disarmor extends AbstractEffect player.broadcastUserInfo(); SystemMessage sm = null; - if (unequiped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED); - sm.addInt(unequiped[0].getEnchantLevel()); - sm.addItemName(unequiped[0]); + sm.addInt(unequippedItem.getEnchantLevel()); + sm.addItemName(unequippedItem); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); - sm.addItemName(unequiped[0]); + sm.addItemName(unequippedItem); } player.sendPacket(sm); effected.getInventory().blockItemSlot(_slot); - _unequippedItems.put(effected.getObjectId(), unequiped[0].getObjectId()); + _unequippedItems.put(effected.getObjectId(), unequippedItem.getObjectId()); } } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 19954820bc..119a616831 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -82,7 +82,7 @@ public class ChangeAttributeCrystal implements IItemHandler return false; } - player.sendPacket(new ExChangeAttributeItemList(item.getId(), itemList.toArray(new ItemInfo[itemList.size()]))); + player.sendPacket(new ExChangeAttributeItemList(item.getId(), itemList)); return true; } } \ No newline at end of file diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/MacroList.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/MacroList.java index 2411db329d..ead95f13ea 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/MacroList.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/MacroList.java @@ -90,8 +90,7 @@ public class MacroList implements IRestorable deleteMacroFromDb(removed); } - final Shortcut[] allShortCuts = _owner.getAllShortCuts(); - for (Shortcut sc : allShortCuts) + for (Shortcut sc : _owner.getAllShortCuts()) { if ((sc.getId() == id) && (sc.getType() == ShortcutType.MACRO)) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/MobGroupTable.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/MobGroupTable.java index 244fd07964..e61d726687 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/MobGroupTable.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/MobGroupTable.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.model; +import java.util.Collection; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -67,9 +68,9 @@ public class MobGroupTable return null; } - public MobGroup[] getGroups() + public Collection getGroups() { - return _groupMap.values().toArray(new MobGroup[_groupMap.size()]); + return _groupMap.values(); } public boolean removeGroup(int groupKey) diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/ShortCuts.java index 8cf01b5f4f..da9c30d0d0 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; +import java.util.Collection; import java.util.Map; import java.util.TreeMap; import java.util.logging.Level; @@ -46,9 +47,9 @@ public class ShortCuts implements IRestorable _owner = owner; } - public Shortcut[] getAllShortCuts() + public Collection getAllShortCuts() { - return _shortCuts.values().toArray(new Shortcut[_shortCuts.values().size()]); + return _shortCuts.values(); } public Shortcut getShortCut(int slot, int page) diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/TradeList.java index 73ac57f840..114e3f112b 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/TradeList.java @@ -107,9 +107,9 @@ public class TradeList /** * @return all items from TradeList */ - public TradeItem[] getItems() + public Collection getItems() { - return _items.toArray(new TradeItem[_items.size()]); + return _items; } /** @@ -863,7 +863,7 @@ public class TradeList final InventoryUpdate playerIU = new InventoryUpdate(); long totalPrice = 0; - final TradeItem[] sellerItems = _items.toArray(new TradeItem[0]); + final TradeItem[] sellerItems = _items.toArray(new TradeItem[_items.size()]); for (ItemRequest item : requestedItems) { // searching item in tradelist using itemId diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index cac92aff01..c9b34c766f 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1568,9 +1568,9 @@ public class PlayerInstance extends Playable } /** - * @return a table containing all ShortCut of the PlayerInstance. + * @return a collection containing all ShortCut of the PlayerInstance. */ - public Shortcut[] getAllShortCuts() + public Collection getAllShortCuts() { return _shortCuts.getAllShortCuts(); } @@ -2221,7 +2221,7 @@ public class PlayerInstance extends Playable } // Equip or unEquip - ItemInstance[] items = null; + List items = null; final boolean isEquiped = item.isEquipped(); final int oldInvLimit = getInventoryLimit(); SystemMessage sm = null; @@ -2291,7 +2291,7 @@ public class PlayerInstance extends Playable broadcastUserInfo(); final InventoryUpdate iu = new InventoryUpdate(); - iu.addItems(Arrays.asList(items)); + iu.addItems(items); sendInventoryUpdate(iu); if (abortAttack) @@ -5842,9 +5842,9 @@ public class PlayerInstance extends Playable return false; } - final ItemInstance[] unequiped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : unequipped) { iu.addModifiedItem(itm); } @@ -5854,19 +5854,20 @@ public class PlayerInstance extends Playable broadcastUserInfo(); // This can be 0 if the user pressed the right mousebutton twice very fast. - if (unequiped.length > 0) + if (!unequipped.isEmpty()) { final SystemMessage sm; - if (unequiped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED); - sm.addInt(unequiped[0].getEnchantLevel()); - sm.addItemName(unequiped[0]); + sm.addInt(unequippedItem.getEnchantLevel()); + sm.addItemName(unequippedItem); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); - sm.addItemName(unequiped[0]); + sm.addItemName(unequippedItem); } sendPacket(sm); } @@ -5882,9 +5883,9 @@ public class PlayerInstance extends Playable final ItemInstance sld = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (sld != null) { - final ItemInstance[] unequiped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : unequipped) { iu.addModifiedItem(itm); } @@ -5894,19 +5895,20 @@ public class PlayerInstance extends Playable broadcastUserInfo(); // this can be 0 if the user pressed the right mousebutton twice very fast - if (unequiped.length > 0) + if (!unequipped.isEmpty()) { SystemMessage sm = null; - if (unequiped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED); - sm.addInt(unequiped[0].getEnchantLevel()); - sm.addItemName(unequiped[0]); + sm.addInt(unequippedItem.getEnchantLevel()); + sm.addItemName(unequippedItem); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); - sm.addItemName(unequiped[0]); + sm.addItemName(unequippedItem); } sendPacket(sm); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/clan/Clan.java index d3f28a8c3f..ef16b5f03c 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -1200,9 +1200,9 @@ public class Clan implements IIdentifiable, INamable /** * @return all the clan skills. */ - public Skill[] getAllSkills() + public Collection getAllSkills() { - return _skills.values().toArray(new Skill[_skills.values().size()]); + return _skills.values(); } /** @@ -1756,9 +1756,9 @@ public class Clan implements IIdentifiable, INamable * Used to retrieve all subPledges * @return */ - public SubPledge[] getAllSubPledges() + public Collection getAllSubPledges() { - return _subPledges.values().toArray(new SubPledge[_subPledges.values().size()]); + return _subPledges.values(); } public SubPledge createSubPledge(int pledgeType) @@ -1910,9 +1910,9 @@ public class Clan implements IIdentifiable, INamable /** * @return all RankPrivs. */ - public RankPrivs[] getAllRankPrivs() + public Collection getAllRankPrivs() { - return _privs.values().toArray(new RankPrivs[_privs.values().size()]); + return _privs.values(); } public int getLeaderSubPledge(int leaderId) @@ -2573,7 +2573,7 @@ public class Clan implements IIdentifiable, INamable return false; } - public SubPledgeSkill[] getAllSubSkills() + public List getAllSubSkills() { final List list = new LinkedList<>(); for (Skill skill : _subPledgeSkills.values()) @@ -2587,7 +2587,7 @@ public class Clan implements IIdentifiable, INamable list.add(new SubPledgeSkill(subunit.getId(), skill.getId(), skill.getLevel())); } } - return list.toArray(new SubPledgeSkill[list.size()]); + return list; } public void setNewLeaderId(int objectId, boolean storeInDb) diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 8f195b1ba9..8c3f3b5bfd 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -2963,9 +2963,8 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime // Destroy the quantity of items wanted if (item.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(item.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInBodySlotAndRecord(item.getItem().getBodyPart())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index f14581064a..0161150ecb 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -347,7 +347,7 @@ public class ItemAuctionInstance return _auctions.get(auctionId); } - public ItemAuction[] getAuctionsByBidder(int bidderObjId) + public ArrayList getAuctionsByBidder(int bidderObjId) { final Collection auctions = getAuctions(); final ArrayList stack = new ArrayList<>(auctions.size()); @@ -362,7 +362,7 @@ public class ItemAuctionInstance } } } - return stack.toArray(new ItemAuction[stack.size()]); + return stack; } public Collection getAuctions() diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 2585945510..ba90f7c426 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -25,8 +25,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; import java.util.function.Predicate; import java.util.logging.Level; @@ -151,7 +149,7 @@ public abstract class Inventory extends ItemContainer private static final class ChangeRecorder implements PaperdollListener { private final Inventory _inventory; - private final Set _changed = ConcurrentHashMap.newKeySet(); + private final List _changed = new ArrayList<>(1); /** * Constructor of the ChangeRecorder @@ -191,9 +189,9 @@ public abstract class Inventory extends ItemContainer * Returns alterations in inventory * @return ItemInstance[] : array of altered items */ - public ItemInstance[] getChangedItems() + public List getChangedItems() { - return _changed.toArray(new ItemInstance[_changed.size()]); + return _changed; } } @@ -1640,12 +1638,11 @@ public abstract class Inventory extends ItemContainer * Unequips item in body slot and returns alterations.
* If you dont need return value use {@link Inventory#unEquipItemInBodySlot(long)} instead * @param slot : int designating the slot of the paperdoll - * @return ItemInstance[] : list of changes + * @return List : List of changes */ - public ItemInstance[] unEquipItemInBodySlotAndRecord(long slot) + public List unEquipItemInBodySlotAndRecord(long slot) { final ChangeRecorder recorder = newRecorder(); - try { unEquipItemInBodySlot(slot); @@ -1671,12 +1668,11 @@ public abstract class Inventory extends ItemContainer * Unequips item in slot and returns alterations
* If you dont need return value use {@link Inventory#unEquipItemInSlot(int)} instead * @param slot : int designating the slot - * @return ItemInstance[] : list of items altered + * @return List : List of items altered */ - public ItemInstance[] unEquipItemInSlotAndRecord(int slot) + public List unEquipItemInSlotAndRecord(int slot) { final ChangeRecorder recorder = newRecorder(); - try { unEquipItemInSlot(slot); @@ -1818,12 +1814,11 @@ public abstract class Inventory extends ItemContainer * Equips item and returns list of alterations
* If you don't need return value use {@link Inventory#equipItem(ItemInstance)} instead * @param item : ItemInstance corresponding to the item - * @return ItemInstance[] : list of alterations + * @return List : List of alterations */ - public ItemInstance[] equipItemAndRecord(ItemInstance item) + public List equipItemAndRecord(ItemInstance item) { final ChangeRecorder recorder = newRecorder(); - try { equipItem(item); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java index 8943842d96..e83c19f0fc 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -1437,9 +1437,8 @@ public class ItemInstance extends WorldObject // unequip if (isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance item : unequiped) + for (ItemInstance item : player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot())) { iu.addModifiedItem(item); } @@ -1873,9 +1872,8 @@ public class ItemInstance extends WorldObject { if (isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance item : unequiped) + for (ItemInstance item : player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot())) { iu.addModifiedItem(item); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/GameClient.java index 99c66513d8..d42e5bf53a 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/GameClient.java @@ -21,6 +21,7 @@ import java.net.InetSocketAddress; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; +import java.util.List; import java.util.concurrent.locks.ReentrantLock; import java.util.logging.Level; import java.util.logging.Logger; @@ -78,7 +79,7 @@ public class GameClient extends ChannelInboundHandler private PlayerInstance _player; private SecondaryPasswordAuth _secondaryAuth; private ClientHardwareInfoHolder _hardwareInfo; - private CharSelectInfoPackage[] _charSlotMapping = null; + private List _charSlotMapping = null; private volatile boolean _isDetached = false; private boolean _isAuthedGG; private boolean _protocolOk; @@ -568,21 +569,18 @@ public class GameClient extends ChannelInboundHandler return player; } - /** - * @param chars - */ - public void setCharSelection(CharSelectInfoPackage[] chars) + public void setCharSelection(List characters) { - _charSlotMapping = chars; + _charSlotMapping = characters; } public CharSelectInfoPackage getCharSelection(int charslot) { - if ((_charSlotMapping == null) || (charslot < 0) || (charslot >= _charSlotMapping.length)) + if ((_charSlotMapping == null) || (charslot < 0) || (charslot >= _charSlotMapping.size())) { return null; } - return _charSlotMapping[charslot]; + return _charSlotMapping.get(charslot); } public SecondaryPasswordAuth getSecondaryAuth() diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 4e8ed724b1..1e1ea92d19 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -202,9 +202,8 @@ public class RequestCrystallizeItem implements IClientIncomingPacket SystemMessage sm; if (itemToRemove.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance item : unequiped) + for (ItemInstance item : player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot())) { iu.addModifiedItem(item); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 0f8f2ab22f..3541ad4b56 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -193,9 +193,8 @@ public class RequestDestroyItem implements IClientIncomingPacket client.sendPacket(sm); } - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index d3dee51253..4917ac1a67 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -309,12 +309,10 @@ public class RequestEnchantItem implements IClientIncomingPacket client.sendPacket(sm); } - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot()); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot())) { iu.addModifiedItem(itm); } - player.sendInventoryUpdate(iu); player.broadcastUserInfo(); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java index 730bd1b8f7..2bc2964039 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.clan.Clan.RankPrivs; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.PledgePowerGradeList; @@ -47,8 +46,7 @@ public class RequestPledgePowerGradeList implements IClientIncomingPacket final Clan clan = player.getClan(); if (clan != null) { - final RankPrivs[] privs = clan.getAllRankPrivs(); - player.sendPacket(new PledgePowerGradeList(privs)); + player.sendPacket(new PledgePowerGradeList(clan.getAllRankPrivs())); } } } \ No newline at end of file diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java index 0933d607bd..21176be244 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java @@ -109,8 +109,7 @@ public class RequestRefine extends AbstractRefinePacket final InventoryUpdate iu = new InventoryUpdate(); if (targetItem.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot()); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java index 240322a5da..a420f830b1 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java @@ -92,8 +92,7 @@ public class RequestRefineCancel implements IClientIncomingPacket final InventoryUpdate iu = new InventoryUpdate(); if (targetItem.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot()); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index f1cc81e68a..629cb64bc7 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.Arrays; +import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.PlayerCondOverride; @@ -99,27 +99,28 @@ public class RequestUnEquipItem implements IClientIncomingPacket return; } - final ItemInstance[] unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); player.broadcastUserInfo(); // This can be 0 if the user pressed the right mouse button twice very fast. - if (unequipped.length > 0) + if (!unequipped.isEmpty()) { SystemMessage sm = null; - if (unequipped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED); - sm.addInt(unequipped[0].getEnchantLevel()); + sm.addInt(unequippedItem.getEnchantLevel()); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); } - sm.addItemName(unequipped[0]); + sm.addItemName(unequippedItem); client.sendPacket(sm); final InventoryUpdate iu = new InventoryUpdate(); - iu.addItems(Arrays.asList(unequipped)); + iu.addItems(unequipped); player.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java index c3f5f4b0fa..7e27d26e1c 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java @@ -69,7 +69,7 @@ public abstract class AbstractInventoryUpdate extends AbstractItemPacket _items.put(item.getObjectId(), new ItemInfo(item, 3)); } - public void addItems(List items) + public void addItems(Collection items) { for (ItemInstance item : items) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 0bcc780208..6c4393e6f3 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -48,7 +48,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket private final String _loginName; private final int _sessionId; private int _activeId; - private final CharSelectInfoPackage[] _characterPackages; + private final List _characterPackages; private static final int[] PAPERDOLL_ORDER = new int[] { @@ -121,7 +121,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket _activeId = activeId; } - public CharSelectInfoPackage[] getCharInfo() + public List getCharInfo() { return _characterPackages; } @@ -131,7 +131,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket { OutgoingPackets.CHARACTER_SELECTION_INFO.writeId(packet); - final int size = _characterPackages.length; + final int size = _characterPackages.size(); packet.writeD(size); // Created character count packet.writeD(Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT); // Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) ) @@ -170,9 +170,9 @@ public class CharSelectionInfo implements IClientOutgoingPacket { for (int i = 0; i < size; i++) { - if (lastAccess < _characterPackages[i].getLastAccess()) + if (lastAccess < _characterPackages.get(i).getLastAccess()) { - lastAccess = _characterPackages[i].getLastAccess(); + lastAccess = _characterPackages.get(i).getLastAccess(); _activeId = i; } } @@ -180,7 +180,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket for (int i = 0; i < size; i++) { - final CharSelectInfoPackage charInfoPackage = _characterPackages[i]; + final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i); packet.writeS(charInfoPackage.getName()); // Character name packet.writeD(charInfoPackage.getObjectId()); // Character ID packet.writeS(_loginName); // Account name @@ -286,7 +286,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket return true; } - private static CharSelectInfoPackage[] loadCharacterSelectInfo(String loginName) + private static List loadCharacterSelectInfo(String loginName) { CharSelectInfoPackage charInfopackage; final List characterList = new LinkedList<>(); @@ -312,13 +312,13 @@ public class CharSelectionInfo implements IClientOutgoingPacket } } } - return characterList.toArray(new CharSelectInfoPackage[characterList.size()]); } catch (Exception e) { LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } - return new CharSelectInfoPackage[0]; + + return characterList; } private static void loadCharacterSubclassInfo(CharSelectInfoPackage charInfopackage, int objectId, int activeClassId) diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java index 20d42578b2..4ae5ffe316 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.clan.Clan; @@ -39,12 +41,12 @@ public class ExPledgeRecruitInfo implements IClientOutgoingPacket { OutgoingPackets.EX_PLEDGE_RECRUIT_INFO.writeId(packet); - final SubPledge[] subPledges = _clan.getAllSubPledges(); + final Collection subPledges = _clan.getAllSubPledges(); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); packet.writeD(_clan.getLevel()); packet.writeD(_clan.getMembersCount()); - packet.writeD(subPledges.length); + packet.writeD(subPledges.size()); for (SubPledge subPledge : subPledges) { packet.writeD(subPledge.getId()); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java index cb2e18edb9..fce9f86d25 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java @@ -16,15 +16,17 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan.RankPrivs; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PledgePowerGradeList implements IClientOutgoingPacket { - private final RankPrivs[] _privs; + private final Collection _privs; - public PledgePowerGradeList(RankPrivs[] privs) + public PledgePowerGradeList(Collection privs) { _privs = privs; } @@ -33,8 +35,7 @@ public class PledgePowerGradeList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_POWER_GRADE_LIST.writeId(packet); - - packet.writeD(_privs.length); + packet.writeD(_privs.size()); for (RankPrivs temp : _privs) { packet.writeD(temp.getRank()); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java index eab507b686..591ab8690a 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java @@ -16,6 +16,9 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; +import java.util.List; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.skills.Skill; @@ -26,8 +29,8 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class PledgeSkillList implements IClientOutgoingPacket { - private final Skill[] _skills; - private final SubPledgeSkill[] _subSkills; + private final Collection _skills; + private final List _subSkills; public static class SubPledgeSkill { @@ -53,9 +56,8 @@ public class PledgeSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SKILL_LIST.writeId(packet); - - packet.writeD(_skills.length); - packet.writeD(_subSkills.length); // Squad skill length + packet.writeD(_skills.size()); + packet.writeD(_subSkills.size()); // Squad skill length for (Skill sk : _skills) { packet.writeD(sk.getDisplayId()); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java index 88a45c71fc..38f43a3fe0 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java @@ -48,7 +48,7 @@ public class PrivateStoreListSell extends AbstractItemPacket packet.writeD(_seller.getSellList().isPackaged() ? 1 : 0); packet.writeQ(_player.getAdena()); packet.writeD(0x00); - packet.writeD(_seller.getSellList().getItems().length); + packet.writeD(_seller.getSellList().getItems().size()); for (TradeItem item : _seller.getSellList().getItems()) { writeItem(packet, item); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index e180102d7f..56dee576c2 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -30,7 +30,7 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket private final int _objId; private final long _playerAdena; private final Collection _itemList; - private final TradeItem[] _buyList; + private final Collection _buyList; public PrivateStoreManageListBuy(int sendType, PlayerInstance player) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java index dfdbbb1524..724eb8998b 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java @@ -30,7 +30,7 @@ public class PrivateStoreManageListSell extends AbstractItemPacket private final long _playerAdena; private final boolean _packageSale; private final Collection _itemList; - private final TradeItem[] _sellList; + private final Collection _sellList; public PrivateStoreManageListSell(int sendType, PlayerInstance player, boolean isPackageSale) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java index 5bb5356fd0..e7a3655f52 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -23,7 +25,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ShortCutInit implements IClientOutgoingPacket { - private Shortcut[] _shortCuts; + private Collection _shortCuts; public ShortCutInit(PlayerInstance player) { @@ -40,7 +42,7 @@ public class ShortCutInit implements IClientOutgoingPacket { OutgoingPackets.SHORT_CUT_INIT.writeId(packet); - packet.writeD(_shortCuts.length); + packet.writeD(_shortCuts.size()); for (Shortcut sc : _shortCuts) { packet.writeD(sc.getType().ordinal()); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java index 7e32d855fe..bfb530ca83 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets.attributechange; +import java.util.List; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -26,13 +28,13 @@ import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket; */ public class ExChangeAttributeItemList extends AbstractItemPacket { - private final ItemInfo[] _itemsList; + private final List _itemsList; private final int _itemId; - public ExChangeAttributeItemList(int itemId, ItemInfo[] itemsList) + public ExChangeAttributeItemList(int itemId, List itemList) { _itemId = itemId; - _itemsList = itemsList; + _itemsList = itemList; } @Override @@ -40,7 +42,7 @@ public class ExChangeAttributeItemList extends AbstractItemPacket { OutgoingPackets.EX_CHANGE_ATTRIBUTE_ITEM_LIST.writeId(packet); packet.writeD(_itemId); - packet.writeD(_itemsList.length); + packet.writeD(_itemsList.size()); for (ItemInfo item : _itemsList) { writeItem(packet, item); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java index 771c0e3848..a34595ca73 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java @@ -594,9 +594,8 @@ public class AdminMobGroup implements IAdminCommandHandler private void showGroupList(PlayerInstance activeChar) { - final MobGroup[] mobGroupList = MobGroupTable.getInstance().getGroups(); BuilderUtil.sendSysMessage(activeChar, "======= ======="); - for (MobGroup mobGroup : mobGroupList) + for (MobGroup mobGroup : MobGroupTable.getInstance().getGroups()) { activeChar.sendMessage(mobGroup.getGroupId() + ": " + mobGroup.getActiveMobCount() + " alive out of " + mobGroup.getMaxMobCount() + " of NPC ID " + mobGroup.getTemplate().getId() + " (" + mobGroup.getStatus() + ")"); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java index 11c52819e5..636639079c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java @@ -99,9 +99,8 @@ public class ItemAuctionLink implements IBypassHandler } else if ("cancel".equalsIgnoreCase(cmd)) { - final ItemAuction[] auctions = au.getAuctionsByBidder(player.getObjectId()); boolean returned = false; - for (ItemAuction auction : auctions) + for (ItemAuction auction : au.getAuctionsByBidder(player.getObjectId())) { if (auction.cancelBid(player)) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index 88740dea9e..4796533f47 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -16,6 +16,8 @@ */ package handlers.effecthandlers; +import java.util.List; + import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -84,7 +86,7 @@ public class ConvertItem extends AbstractEffect final int enchantLevel = wpn.getEnchantLevel(); final AttributeHolder elementals = wpn.getAttributes() == null ? null : wpn.getAttackAttribute(); - final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (ItemInstance unequippedItem : unequiped) { @@ -92,10 +94,11 @@ public class ConvertItem extends AbstractEffect } player.sendInventoryUpdate(iu); - if (unequiped.length <= 0) + if (unequiped.isEmpty()) { return; } + byte count = 0; for (ItemInstance unequippedItem : unequiped) { @@ -120,7 +123,7 @@ public class ConvertItem extends AbstractEffect player.sendPacket(sm); } - if (count == unequiped.length) + if (count == unequiped.size()) { return; } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index f0c25bcfbf..3fb226310b 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -16,6 +16,7 @@ */ package handlers.effecthandlers; +import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -67,11 +68,11 @@ public class Disarmor extends AbstractEffect } final PlayerInstance player = effected.getActingPlayer(); - final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); - if (unequiped.length > 0) + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); + if (!unequipped.isEmpty()) { final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : unequipped) { iu.addModifiedItem(itm); } @@ -79,20 +80,21 @@ public class Disarmor extends AbstractEffect player.broadcastUserInfo(); SystemMessage sm = null; - if (unequiped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED); - sm.addInt(unequiped[0].getEnchantLevel()); - sm.addItemName(unequiped[0]); + sm.addInt(unequippedItem.getEnchantLevel()); + sm.addItemName(unequippedItem); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); - sm.addItemName(unequiped[0]); + sm.addItemName(unequippedItem); } player.sendPacket(sm); effected.getInventory().blockItemSlot(_slot); - _unequippedItems.put(effected.getObjectId(), unequiped[0].getObjectId()); + _unequippedItems.put(effected.getObjectId(), unequippedItem.getObjectId()); } } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 19954820bc..119a616831 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -82,7 +82,7 @@ public class ChangeAttributeCrystal implements IItemHandler return false; } - player.sendPacket(new ExChangeAttributeItemList(item.getId(), itemList.toArray(new ItemInfo[itemList.size()]))); + player.sendPacket(new ExChangeAttributeItemList(item.getId(), itemList)); return true; } } \ No newline at end of file diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/MacroList.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/MacroList.java index 2411db329d..ead95f13ea 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/MacroList.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/MacroList.java @@ -90,8 +90,7 @@ public class MacroList implements IRestorable deleteMacroFromDb(removed); } - final Shortcut[] allShortCuts = _owner.getAllShortCuts(); - for (Shortcut sc : allShortCuts) + for (Shortcut sc : _owner.getAllShortCuts()) { if ((sc.getId() == id) && (sc.getType() == ShortcutType.MACRO)) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/MobGroupTable.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/MobGroupTable.java index 244fd07964..e61d726687 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/MobGroupTable.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/MobGroupTable.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.model; +import java.util.Collection; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -67,9 +68,9 @@ public class MobGroupTable return null; } - public MobGroup[] getGroups() + public Collection getGroups() { - return _groupMap.values().toArray(new MobGroup[_groupMap.size()]); + return _groupMap.values(); } public boolean removeGroup(int groupKey) diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/ShortCuts.java index 8cf01b5f4f..da9c30d0d0 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; +import java.util.Collection; import java.util.Map; import java.util.TreeMap; import java.util.logging.Level; @@ -46,9 +47,9 @@ public class ShortCuts implements IRestorable _owner = owner; } - public Shortcut[] getAllShortCuts() + public Collection getAllShortCuts() { - return _shortCuts.values().toArray(new Shortcut[_shortCuts.values().size()]); + return _shortCuts.values(); } public Shortcut getShortCut(int slot, int page) diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/TradeList.java index 73ac57f840..114e3f112b 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/TradeList.java @@ -107,9 +107,9 @@ public class TradeList /** * @return all items from TradeList */ - public TradeItem[] getItems() + public Collection getItems() { - return _items.toArray(new TradeItem[_items.size()]); + return _items; } /** @@ -863,7 +863,7 @@ public class TradeList final InventoryUpdate playerIU = new InventoryUpdate(); long totalPrice = 0; - final TradeItem[] sellerItems = _items.toArray(new TradeItem[0]); + final TradeItem[] sellerItems = _items.toArray(new TradeItem[_items.size()]); for (ItemRequest item : requestedItems) { // searching item in tradelist using itemId diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 3ea3f8d172..6667b18390 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1568,9 +1568,9 @@ public class PlayerInstance extends Playable } /** - * @return a table containing all ShortCut of the PlayerInstance. + * @return a collection containing all ShortCut of the PlayerInstance. */ - public Shortcut[] getAllShortCuts() + public Collection getAllShortCuts() { return _shortCuts.getAllShortCuts(); } @@ -2221,7 +2221,7 @@ public class PlayerInstance extends Playable } // Equip or unEquip - ItemInstance[] items = null; + List items = null; final boolean isEquiped = item.isEquipped(); final int oldInvLimit = getInventoryLimit(); SystemMessage sm = null; @@ -2291,7 +2291,7 @@ public class PlayerInstance extends Playable broadcastUserInfo(); final InventoryUpdate iu = new InventoryUpdate(); - iu.addItems(Arrays.asList(items)); + iu.addItems(items); sendInventoryUpdate(iu); if (abortAttack) @@ -5842,9 +5842,9 @@ public class PlayerInstance extends Playable return false; } - final ItemInstance[] unequiped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : unequipped) { iu.addModifiedItem(itm); } @@ -5854,19 +5854,20 @@ public class PlayerInstance extends Playable broadcastUserInfo(); // This can be 0 if the user pressed the right mousebutton twice very fast. - if (unequiped.length > 0) + if (!unequipped.isEmpty()) { final SystemMessage sm; - if (unequiped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED); - sm.addInt(unequiped[0].getEnchantLevel()); - sm.addItemName(unequiped[0]); + sm.addInt(unequippedItem.getEnchantLevel()); + sm.addItemName(unequippedItem); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); - sm.addItemName(unequiped[0]); + sm.addItemName(unequippedItem); } sendPacket(sm); } @@ -5882,9 +5883,9 @@ public class PlayerInstance extends Playable final ItemInstance sld = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (sld != null) { - final ItemInstance[] unequiped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : unequipped) { iu.addModifiedItem(itm); } @@ -5894,19 +5895,20 @@ public class PlayerInstance extends Playable broadcastUserInfo(); // this can be 0 if the user pressed the right mousebutton twice very fast - if (unequiped.length > 0) + if (!unequipped.isEmpty()) { SystemMessage sm = null; - if (unequiped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED); - sm.addInt(unequiped[0].getEnchantLevel()); - sm.addItemName(unequiped[0]); + sm.addInt(unequippedItem.getEnchantLevel()); + sm.addItemName(unequippedItem); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); - sm.addItemName(unequiped[0]); + sm.addItemName(unequippedItem); } sendPacket(sm); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/Clan.java index d3f28a8c3f..ef16b5f03c 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -1200,9 +1200,9 @@ public class Clan implements IIdentifiable, INamable /** * @return all the clan skills. */ - public Skill[] getAllSkills() + public Collection getAllSkills() { - return _skills.values().toArray(new Skill[_skills.values().size()]); + return _skills.values(); } /** @@ -1756,9 +1756,9 @@ public class Clan implements IIdentifiable, INamable * Used to retrieve all subPledges * @return */ - public SubPledge[] getAllSubPledges() + public Collection getAllSubPledges() { - return _subPledges.values().toArray(new SubPledge[_subPledges.values().size()]); + return _subPledges.values(); } public SubPledge createSubPledge(int pledgeType) @@ -1910,9 +1910,9 @@ public class Clan implements IIdentifiable, INamable /** * @return all RankPrivs. */ - public RankPrivs[] getAllRankPrivs() + public Collection getAllRankPrivs() { - return _privs.values().toArray(new RankPrivs[_privs.values().size()]); + return _privs.values(); } public int getLeaderSubPledge(int leaderId) @@ -2573,7 +2573,7 @@ public class Clan implements IIdentifiable, INamable return false; } - public SubPledgeSkill[] getAllSubSkills() + public List getAllSubSkills() { final List list = new LinkedList<>(); for (Skill skill : _subPledgeSkills.values()) @@ -2587,7 +2587,7 @@ public class Clan implements IIdentifiable, INamable list.add(new SubPledgeSkill(subunit.getId(), skill.getId(), skill.getLevel())); } } - return list.toArray(new SubPledgeSkill[list.size()]); + return list; } public void setNewLeaderId(int objectId, boolean storeInDb) diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 8f195b1ba9..8c3f3b5bfd 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -2963,9 +2963,8 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime // Destroy the quantity of items wanted if (item.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(item.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInBodySlotAndRecord(item.getItem().getBodyPart())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index f14581064a..0161150ecb 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -347,7 +347,7 @@ public class ItemAuctionInstance return _auctions.get(auctionId); } - public ItemAuction[] getAuctionsByBidder(int bidderObjId) + public ArrayList getAuctionsByBidder(int bidderObjId) { final Collection auctions = getAuctions(); final ArrayList stack = new ArrayList<>(auctions.size()); @@ -362,7 +362,7 @@ public class ItemAuctionInstance } } } - return stack.toArray(new ItemAuction[stack.size()]); + return stack; } public Collection getAuctions() diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 08e4d99d8a..ca306d2071 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -25,8 +25,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; import java.util.function.Predicate; import java.util.logging.Level; @@ -174,7 +172,7 @@ public abstract class Inventory extends ItemContainer private static final class ChangeRecorder implements PaperdollListener { private final Inventory _inventory; - private final Set _changed = ConcurrentHashMap.newKeySet(); + private final List _changed = new ArrayList<>(1); /** * Constructor of the ChangeRecorder @@ -214,9 +212,9 @@ public abstract class Inventory extends ItemContainer * Returns alterations in inventory * @return ItemInstance[] : array of altered items */ - public ItemInstance[] getChangedItems() + public List getChangedItems() { - return _changed.toArray(new ItemInstance[_changed.size()]); + return _changed; } } @@ -1745,12 +1743,11 @@ public abstract class Inventory extends ItemContainer * Unequips item in body slot and returns alterations.
* If you dont need return value use {@link Inventory#unEquipItemInBodySlot(long)} instead * @param slot : int designating the slot of the paperdoll - * @return ItemInstance[] : list of changes + * @return List : List of changes */ - public ItemInstance[] unEquipItemInBodySlotAndRecord(long slot) + public List unEquipItemInBodySlotAndRecord(long slot) { final ChangeRecorder recorder = newRecorder(); - try { unEquipItemInBodySlot(slot); @@ -1776,12 +1773,11 @@ public abstract class Inventory extends ItemContainer * Unequips item in slot and returns alterations
* If you dont need return value use {@link Inventory#unEquipItemInSlot(int)} instead * @param slot : int designating the slot - * @return ItemInstance[] : list of items altered + * @return List : List of items altered */ - public ItemInstance[] unEquipItemInSlotAndRecord(int slot) + public List unEquipItemInSlotAndRecord(int slot) { final ChangeRecorder recorder = newRecorder(); - try { unEquipItemInSlot(slot); @@ -1931,12 +1927,11 @@ public abstract class Inventory extends ItemContainer * Equips item and returns list of alterations
* If you don't need return value use {@link Inventory#equipItem(ItemInstance)} instead * @param item : ItemInstance corresponding to the item - * @return ItemInstance[] : list of alterations + * @return List : List of alterations */ - public ItemInstance[] equipItemAndRecord(ItemInstance item) + public List equipItemAndRecord(ItemInstance item) { final ChangeRecorder recorder = newRecorder(); - try { equipItem(item); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java index 8943842d96..e83c19f0fc 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -1437,9 +1437,8 @@ public class ItemInstance extends WorldObject // unequip if (isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance item : unequiped) + for (ItemInstance item : player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot())) { iu.addModifiedItem(item); } @@ -1873,9 +1872,8 @@ public class ItemInstance extends WorldObject { if (isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance item : unequiped) + for (ItemInstance item : player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot())) { iu.addModifiedItem(item); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/GameClient.java index 99c66513d8..d42e5bf53a 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/GameClient.java @@ -21,6 +21,7 @@ import java.net.InetSocketAddress; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; +import java.util.List; import java.util.concurrent.locks.ReentrantLock; import java.util.logging.Level; import java.util.logging.Logger; @@ -78,7 +79,7 @@ public class GameClient extends ChannelInboundHandler private PlayerInstance _player; private SecondaryPasswordAuth _secondaryAuth; private ClientHardwareInfoHolder _hardwareInfo; - private CharSelectInfoPackage[] _charSlotMapping = null; + private List _charSlotMapping = null; private volatile boolean _isDetached = false; private boolean _isAuthedGG; private boolean _protocolOk; @@ -568,21 +569,18 @@ public class GameClient extends ChannelInboundHandler return player; } - /** - * @param chars - */ - public void setCharSelection(CharSelectInfoPackage[] chars) + public void setCharSelection(List characters) { - _charSlotMapping = chars; + _charSlotMapping = characters; } public CharSelectInfoPackage getCharSelection(int charslot) { - if ((_charSlotMapping == null) || (charslot < 0) || (charslot >= _charSlotMapping.length)) + if ((_charSlotMapping == null) || (charslot < 0) || (charslot >= _charSlotMapping.size())) { return null; } - return _charSlotMapping[charslot]; + return _charSlotMapping.get(charslot); } public SecondaryPasswordAuth getSecondaryAuth() diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 4e8ed724b1..1e1ea92d19 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -202,9 +202,8 @@ public class RequestCrystallizeItem implements IClientIncomingPacket SystemMessage sm; if (itemToRemove.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance item : unequiped) + for (ItemInstance item : player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot())) { iu.addModifiedItem(item); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 0f8f2ab22f..3541ad4b56 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -193,9 +193,8 @@ public class RequestDestroyItem implements IClientIncomingPacket client.sendPacket(sm); } - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index d3dee51253..4917ac1a67 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -309,12 +309,10 @@ public class RequestEnchantItem implements IClientIncomingPacket client.sendPacket(sm); } - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot()); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot())) { iu.addModifiedItem(itm); } - player.sendInventoryUpdate(iu); player.broadcastUserInfo(); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java index 730bd1b8f7..2bc2964039 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.clan.Clan.RankPrivs; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.PledgePowerGradeList; @@ -47,8 +46,7 @@ public class RequestPledgePowerGradeList implements IClientIncomingPacket final Clan clan = player.getClan(); if (clan != null) { - final RankPrivs[] privs = clan.getAllRankPrivs(); - player.sendPacket(new PledgePowerGradeList(privs)); + player.sendPacket(new PledgePowerGradeList(clan.getAllRankPrivs())); } } } \ No newline at end of file diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java index 0933d607bd..21176be244 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java @@ -109,8 +109,7 @@ public class RequestRefine extends AbstractRefinePacket final InventoryUpdate iu = new InventoryUpdate(); if (targetItem.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot()); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java index 240322a5da..a420f830b1 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java @@ -92,8 +92,7 @@ public class RequestRefineCancel implements IClientIncomingPacket final InventoryUpdate iu = new InventoryUpdate(); if (targetItem.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot()); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index f1cc81e68a..629cb64bc7 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.Arrays; +import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.PlayerCondOverride; @@ -99,27 +99,28 @@ public class RequestUnEquipItem implements IClientIncomingPacket return; } - final ItemInstance[] unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); player.broadcastUserInfo(); // This can be 0 if the user pressed the right mouse button twice very fast. - if (unequipped.length > 0) + if (!unequipped.isEmpty()) { SystemMessage sm = null; - if (unequipped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED); - sm.addInt(unequipped[0].getEnchantLevel()); + sm.addInt(unequippedItem.getEnchantLevel()); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); } - sm.addItemName(unequipped[0]); + sm.addItemName(unequippedItem); client.sendPacket(sm); final InventoryUpdate iu = new InventoryUpdate(); - iu.addItems(Arrays.asList(unequipped)); + iu.addItems(unequipped); player.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java index c3f5f4b0fa..7e27d26e1c 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java @@ -69,7 +69,7 @@ public abstract class AbstractInventoryUpdate extends AbstractItemPacket _items.put(item.getObjectId(), new ItemInfo(item, 3)); } - public void addItems(List items) + public void addItems(Collection items) { for (ItemInstance item : items) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 24af521ca5..3098adfb6f 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -48,7 +48,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket private final String _loginName; private final int _sessionId; private int _activeId; - private final CharSelectInfoPackage[] _characterPackages; + private final List _characterPackages; private static final int[] PAPERDOLL_ORDER = new int[] { @@ -148,7 +148,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket _activeId = activeId; } - public CharSelectInfoPackage[] getCharInfo() + public List getCharInfo() { return _characterPackages; } @@ -158,7 +158,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket { OutgoingPackets.CHARACTER_SELECTION_INFO.writeId(packet); - final int size = _characterPackages.length; + final int size = _characterPackages.size(); packet.writeD(size); // Created character count packet.writeD(Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT); // Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) ) @@ -197,9 +197,9 @@ public class CharSelectionInfo implements IClientOutgoingPacket { for (int i = 0; i < size; i++) { - if (lastAccess < _characterPackages[i].getLastAccess()) + if (lastAccess < _characterPackages.get(i).getLastAccess()) { - lastAccess = _characterPackages[i].getLastAccess(); + lastAccess = _characterPackages.get(i).getLastAccess(); _activeId = i; } } @@ -207,7 +207,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket for (int i = 0; i < size; i++) { - final CharSelectInfoPackage charInfoPackage = _characterPackages[i]; + final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i); packet.writeS(charInfoPackage.getName()); // Character name packet.writeD(charInfoPackage.getObjectId()); // Character ID packet.writeS(_loginName); // Account name @@ -307,7 +307,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket return true; } - private static CharSelectInfoPackage[] loadCharacterSelectInfo(String loginName) + private static List loadCharacterSelectInfo(String loginName) { CharSelectInfoPackage charInfopackage; final List characterList = new LinkedList<>(); @@ -333,13 +333,13 @@ public class CharSelectionInfo implements IClientOutgoingPacket } } } - return characterList.toArray(new CharSelectInfoPackage[characterList.size()]); } catch (Exception e) { LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } - return new CharSelectInfoPackage[0]; + + return characterList; } private static void loadCharacterSubclassInfo(CharSelectInfoPackage charInfopackage, int objectId, int activeClassId) diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java index 20d42578b2..4ae5ffe316 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.clan.Clan; @@ -39,12 +41,12 @@ public class ExPledgeRecruitInfo implements IClientOutgoingPacket { OutgoingPackets.EX_PLEDGE_RECRUIT_INFO.writeId(packet); - final SubPledge[] subPledges = _clan.getAllSubPledges(); + final Collection subPledges = _clan.getAllSubPledges(); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); packet.writeD(_clan.getLevel()); packet.writeD(_clan.getMembersCount()); - packet.writeD(subPledges.length); + packet.writeD(subPledges.size()); for (SubPledge subPledge : subPledges) { packet.writeD(subPledge.getId()); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java index cb2e18edb9..fce9f86d25 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java @@ -16,15 +16,17 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan.RankPrivs; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PledgePowerGradeList implements IClientOutgoingPacket { - private final RankPrivs[] _privs; + private final Collection _privs; - public PledgePowerGradeList(RankPrivs[] privs) + public PledgePowerGradeList(Collection privs) { _privs = privs; } @@ -33,8 +35,7 @@ public class PledgePowerGradeList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_POWER_GRADE_LIST.writeId(packet); - - packet.writeD(_privs.length); + packet.writeD(_privs.size()); for (RankPrivs temp : _privs) { packet.writeD(temp.getRank()); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java index eab507b686..591ab8690a 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java @@ -16,6 +16,9 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; +import java.util.List; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.skills.Skill; @@ -26,8 +29,8 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class PledgeSkillList implements IClientOutgoingPacket { - private final Skill[] _skills; - private final SubPledgeSkill[] _subSkills; + private final Collection _skills; + private final List _subSkills; public static class SubPledgeSkill { @@ -53,9 +56,8 @@ public class PledgeSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SKILL_LIST.writeId(packet); - - packet.writeD(_skills.length); - packet.writeD(_subSkills.length); // Squad skill length + packet.writeD(_skills.size()); + packet.writeD(_subSkills.size()); // Squad skill length for (Skill sk : _skills) { packet.writeD(sk.getDisplayId()); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java index 88a45c71fc..38f43a3fe0 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java @@ -48,7 +48,7 @@ public class PrivateStoreListSell extends AbstractItemPacket packet.writeD(_seller.getSellList().isPackaged() ? 1 : 0); packet.writeQ(_player.getAdena()); packet.writeD(0x00); - packet.writeD(_seller.getSellList().getItems().length); + packet.writeD(_seller.getSellList().getItems().size()); for (TradeItem item : _seller.getSellList().getItems()) { writeItem(packet, item); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index e180102d7f..56dee576c2 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -30,7 +30,7 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket private final int _objId; private final long _playerAdena; private final Collection _itemList; - private final TradeItem[] _buyList; + private final Collection _buyList; public PrivateStoreManageListBuy(int sendType, PlayerInstance player) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java index dfdbbb1524..724eb8998b 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java @@ -30,7 +30,7 @@ public class PrivateStoreManageListSell extends AbstractItemPacket private final long _playerAdena; private final boolean _packageSale; private final Collection _itemList; - private final TradeItem[] _sellList; + private final Collection _sellList; public PrivateStoreManageListSell(int sendType, PlayerInstance player, boolean isPackageSale) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java index 5bb5356fd0..e7a3655f52 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -23,7 +25,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ShortCutInit implements IClientOutgoingPacket { - private Shortcut[] _shortCuts; + private Collection _shortCuts; public ShortCutInit(PlayerInstance player) { @@ -40,7 +42,7 @@ public class ShortCutInit implements IClientOutgoingPacket { OutgoingPackets.SHORT_CUT_INIT.writeId(packet); - packet.writeD(_shortCuts.length); + packet.writeD(_shortCuts.size()); for (Shortcut sc : _shortCuts) { packet.writeD(sc.getType().ordinal()); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java index 7e32d855fe..bfb530ca83 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets.attributechange; +import java.util.List; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -26,13 +28,13 @@ import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket; */ public class ExChangeAttributeItemList extends AbstractItemPacket { - private final ItemInfo[] _itemsList; + private final List _itemsList; private final int _itemId; - public ExChangeAttributeItemList(int itemId, ItemInfo[] itemsList) + public ExChangeAttributeItemList(int itemId, List itemList) { _itemId = itemId; - _itemsList = itemsList; + _itemsList = itemList; } @Override @@ -40,7 +42,7 @@ public class ExChangeAttributeItemList extends AbstractItemPacket { OutgoingPackets.EX_CHANGE_ATTRIBUTE_ITEM_LIST.writeId(packet); packet.writeD(_itemId); - packet.writeD(_itemsList.length); + packet.writeD(_itemsList.size()); for (ItemInfo item : _itemsList) { writeItem(packet, item); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java index 771c0e3848..a34595ca73 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java @@ -594,9 +594,8 @@ public class AdminMobGroup implements IAdminCommandHandler private void showGroupList(PlayerInstance activeChar) { - final MobGroup[] mobGroupList = MobGroupTable.getInstance().getGroups(); BuilderUtil.sendSysMessage(activeChar, "======= ======="); - for (MobGroup mobGroup : mobGroupList) + for (MobGroup mobGroup : MobGroupTable.getInstance().getGroups()) { activeChar.sendMessage(mobGroup.getGroupId() + ": " + mobGroup.getActiveMobCount() + " alive out of " + mobGroup.getMaxMobCount() + " of NPC ID " + mobGroup.getTemplate().getId() + " (" + mobGroup.getStatus() + ")"); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java index 11c52819e5..636639079c 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java @@ -99,9 +99,8 @@ public class ItemAuctionLink implements IBypassHandler } else if ("cancel".equalsIgnoreCase(cmd)) { - final ItemAuction[] auctions = au.getAuctionsByBidder(player.getObjectId()); boolean returned = false; - for (ItemAuction auction : auctions) + for (ItemAuction auction : au.getAuctionsByBidder(player.getObjectId())) { if (auction.cancelBid(player)) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index 88740dea9e..4796533f47 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -16,6 +16,8 @@ */ package handlers.effecthandlers; +import java.util.List; + import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -84,7 +86,7 @@ public class ConvertItem extends AbstractEffect final int enchantLevel = wpn.getEnchantLevel(); final AttributeHolder elementals = wpn.getAttributes() == null ? null : wpn.getAttackAttribute(); - final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (ItemInstance unequippedItem : unequiped) { @@ -92,10 +94,11 @@ public class ConvertItem extends AbstractEffect } player.sendInventoryUpdate(iu); - if (unequiped.length <= 0) + if (unequiped.isEmpty()) { return; } + byte count = 0; for (ItemInstance unequippedItem : unequiped) { @@ -120,7 +123,7 @@ public class ConvertItem extends AbstractEffect player.sendPacket(sm); } - if (count == unequiped.length) + if (count == unequiped.size()) { return; } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index f0c25bcfbf..3fb226310b 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -16,6 +16,7 @@ */ package handlers.effecthandlers; +import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -67,11 +68,11 @@ public class Disarmor extends AbstractEffect } final PlayerInstance player = effected.getActingPlayer(); - final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); - if (unequiped.length > 0) + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); + if (!unequipped.isEmpty()) { final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : unequipped) { iu.addModifiedItem(itm); } @@ -79,20 +80,21 @@ public class Disarmor extends AbstractEffect player.broadcastUserInfo(); SystemMessage sm = null; - if (unequiped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED); - sm.addInt(unequiped[0].getEnchantLevel()); - sm.addItemName(unequiped[0]); + sm.addInt(unequippedItem.getEnchantLevel()); + sm.addItemName(unequippedItem); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); - sm.addItemName(unequiped[0]); + sm.addItemName(unequippedItem); } player.sendPacket(sm); effected.getInventory().blockItemSlot(_slot); - _unequippedItems.put(effected.getObjectId(), unequiped[0].getObjectId()); + _unequippedItems.put(effected.getObjectId(), unequippedItem.getObjectId()); } } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 19954820bc..119a616831 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -82,7 +82,7 @@ public class ChangeAttributeCrystal implements IItemHandler return false; } - player.sendPacket(new ExChangeAttributeItemList(item.getId(), itemList.toArray(new ItemInfo[itemList.size()]))); + player.sendPacket(new ExChangeAttributeItemList(item.getId(), itemList)); return true; } } \ No newline at end of file diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/MacroList.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/MacroList.java index 2411db329d..ead95f13ea 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/MacroList.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/MacroList.java @@ -90,8 +90,7 @@ public class MacroList implements IRestorable deleteMacroFromDb(removed); } - final Shortcut[] allShortCuts = _owner.getAllShortCuts(); - for (Shortcut sc : allShortCuts) + for (Shortcut sc : _owner.getAllShortCuts()) { if ((sc.getId() == id) && (sc.getType() == ShortcutType.MACRO)) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/MobGroupTable.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/MobGroupTable.java index 244fd07964..e61d726687 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/MobGroupTable.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/MobGroupTable.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.model; +import java.util.Collection; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -67,9 +68,9 @@ public class MobGroupTable return null; } - public MobGroup[] getGroups() + public Collection getGroups() { - return _groupMap.values().toArray(new MobGroup[_groupMap.size()]); + return _groupMap.values(); } public boolean removeGroup(int groupKey) diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/ShortCuts.java index 8cf01b5f4f..da9c30d0d0 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; +import java.util.Collection; import java.util.Map; import java.util.TreeMap; import java.util.logging.Level; @@ -46,9 +47,9 @@ public class ShortCuts implements IRestorable _owner = owner; } - public Shortcut[] getAllShortCuts() + public Collection getAllShortCuts() { - return _shortCuts.values().toArray(new Shortcut[_shortCuts.values().size()]); + return _shortCuts.values(); } public Shortcut getShortCut(int slot, int page) diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/TradeList.java index 73ac57f840..114e3f112b 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/TradeList.java @@ -107,9 +107,9 @@ public class TradeList /** * @return all items from TradeList */ - public TradeItem[] getItems() + public Collection getItems() { - return _items.toArray(new TradeItem[_items.size()]); + return _items; } /** @@ -863,7 +863,7 @@ public class TradeList final InventoryUpdate playerIU = new InventoryUpdate(); long totalPrice = 0; - final TradeItem[] sellerItems = _items.toArray(new TradeItem[0]); + final TradeItem[] sellerItems = _items.toArray(new TradeItem[_items.size()]); for (ItemRequest item : requestedItems) { // searching item in tradelist using itemId diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index bd28b6e226..f73a1a8dfb 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1568,9 +1568,9 @@ public class PlayerInstance extends Playable } /** - * @return a table containing all ShortCut of the PlayerInstance. + * @return a collection containing all ShortCut of the PlayerInstance. */ - public Shortcut[] getAllShortCuts() + public Collection getAllShortCuts() { return _shortCuts.getAllShortCuts(); } @@ -2221,7 +2221,7 @@ public class PlayerInstance extends Playable } // Equip or unEquip - ItemInstance[] items = null; + List items = null; final boolean isEquiped = item.isEquipped(); final int oldInvLimit = getInventoryLimit(); SystemMessage sm = null; @@ -2291,7 +2291,7 @@ public class PlayerInstance extends Playable broadcastUserInfo(); final InventoryUpdate iu = new InventoryUpdate(); - iu.addItems(Arrays.asList(items)); + iu.addItems(items); sendInventoryUpdate(iu); if (abortAttack) @@ -5843,9 +5843,9 @@ public class PlayerInstance extends Playable return false; } - final ItemInstance[] unequiped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : unequipped) { iu.addModifiedItem(itm); } @@ -5855,19 +5855,20 @@ public class PlayerInstance extends Playable broadcastUserInfo(); // This can be 0 if the user pressed the right mousebutton twice very fast. - if (unequiped.length > 0) + if (!unequipped.isEmpty()) { final SystemMessage sm; - if (unequiped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED); - sm.addInt(unequiped[0].getEnchantLevel()); - sm.addItemName(unequiped[0]); + sm.addInt(unequippedItem.getEnchantLevel()); + sm.addItemName(unequippedItem); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); - sm.addItemName(unequiped[0]); + sm.addItemName(unequippedItem); } sendPacket(sm); } @@ -5883,9 +5884,9 @@ public class PlayerInstance extends Playable final ItemInstance sld = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (sld != null) { - final ItemInstance[] unequiped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : unequipped) { iu.addModifiedItem(itm); } @@ -5895,19 +5896,20 @@ public class PlayerInstance extends Playable broadcastUserInfo(); // this can be 0 if the user pressed the right mousebutton twice very fast - if (unequiped.length > 0) + if (!unequipped.isEmpty()) { SystemMessage sm = null; - if (unequiped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED); - sm.addInt(unequiped[0].getEnchantLevel()); - sm.addItemName(unequiped[0]); + sm.addInt(unequippedItem.getEnchantLevel()); + sm.addItemName(unequippedItem); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); - sm.addItemName(unequiped[0]); + sm.addItemName(unequippedItem); } sendPacket(sm); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/Clan.java index d3f28a8c3f..ef16b5f03c 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -1200,9 +1200,9 @@ public class Clan implements IIdentifiable, INamable /** * @return all the clan skills. */ - public Skill[] getAllSkills() + public Collection getAllSkills() { - return _skills.values().toArray(new Skill[_skills.values().size()]); + return _skills.values(); } /** @@ -1756,9 +1756,9 @@ public class Clan implements IIdentifiable, INamable * Used to retrieve all subPledges * @return */ - public SubPledge[] getAllSubPledges() + public Collection getAllSubPledges() { - return _subPledges.values().toArray(new SubPledge[_subPledges.values().size()]); + return _subPledges.values(); } public SubPledge createSubPledge(int pledgeType) @@ -1910,9 +1910,9 @@ public class Clan implements IIdentifiable, INamable /** * @return all RankPrivs. */ - public RankPrivs[] getAllRankPrivs() + public Collection getAllRankPrivs() { - return _privs.values().toArray(new RankPrivs[_privs.values().size()]); + return _privs.values(); } public int getLeaderSubPledge(int leaderId) @@ -2573,7 +2573,7 @@ public class Clan implements IIdentifiable, INamable return false; } - public SubPledgeSkill[] getAllSubSkills() + public List getAllSubSkills() { final List list = new LinkedList<>(); for (Skill skill : _subPledgeSkills.values()) @@ -2587,7 +2587,7 @@ public class Clan implements IIdentifiable, INamable list.add(new SubPledgeSkill(subunit.getId(), skill.getId(), skill.getLevel())); } } - return list.toArray(new SubPledgeSkill[list.size()]); + return list; } public void setNewLeaderId(int objectId, boolean storeInDb) diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 8f195b1ba9..8c3f3b5bfd 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -2963,9 +2963,8 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime // Destroy the quantity of items wanted if (item.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(item.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInBodySlotAndRecord(item.getItem().getBodyPart())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index f14581064a..0161150ecb 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -347,7 +347,7 @@ public class ItemAuctionInstance return _auctions.get(auctionId); } - public ItemAuction[] getAuctionsByBidder(int bidderObjId) + public ArrayList getAuctionsByBidder(int bidderObjId) { final Collection auctions = getAuctions(); final ArrayList stack = new ArrayList<>(auctions.size()); @@ -362,7 +362,7 @@ public class ItemAuctionInstance } } } - return stack.toArray(new ItemAuction[stack.size()]); + return stack; } public Collection getAuctions() diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 08e4d99d8a..ca306d2071 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -25,8 +25,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; import java.util.function.Predicate; import java.util.logging.Level; @@ -174,7 +172,7 @@ public abstract class Inventory extends ItemContainer private static final class ChangeRecorder implements PaperdollListener { private final Inventory _inventory; - private final Set _changed = ConcurrentHashMap.newKeySet(); + private final List _changed = new ArrayList<>(1); /** * Constructor of the ChangeRecorder @@ -214,9 +212,9 @@ public abstract class Inventory extends ItemContainer * Returns alterations in inventory * @return ItemInstance[] : array of altered items */ - public ItemInstance[] getChangedItems() + public List getChangedItems() { - return _changed.toArray(new ItemInstance[_changed.size()]); + return _changed; } } @@ -1745,12 +1743,11 @@ public abstract class Inventory extends ItemContainer * Unequips item in body slot and returns alterations.
* If you dont need return value use {@link Inventory#unEquipItemInBodySlot(long)} instead * @param slot : int designating the slot of the paperdoll - * @return ItemInstance[] : list of changes + * @return List : List of changes */ - public ItemInstance[] unEquipItemInBodySlotAndRecord(long slot) + public List unEquipItemInBodySlotAndRecord(long slot) { final ChangeRecorder recorder = newRecorder(); - try { unEquipItemInBodySlot(slot); @@ -1776,12 +1773,11 @@ public abstract class Inventory extends ItemContainer * Unequips item in slot and returns alterations
* If you dont need return value use {@link Inventory#unEquipItemInSlot(int)} instead * @param slot : int designating the slot - * @return ItemInstance[] : list of items altered + * @return List : List of items altered */ - public ItemInstance[] unEquipItemInSlotAndRecord(int slot) + public List unEquipItemInSlotAndRecord(int slot) { final ChangeRecorder recorder = newRecorder(); - try { unEquipItemInSlot(slot); @@ -1931,12 +1927,11 @@ public abstract class Inventory extends ItemContainer * Equips item and returns list of alterations
* If you don't need return value use {@link Inventory#equipItem(ItemInstance)} instead * @param item : ItemInstance corresponding to the item - * @return ItemInstance[] : list of alterations + * @return List : List of alterations */ - public ItemInstance[] equipItemAndRecord(ItemInstance item) + public List equipItemAndRecord(ItemInstance item) { final ChangeRecorder recorder = newRecorder(); - try { equipItem(item); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java index 8943842d96..e83c19f0fc 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -1437,9 +1437,8 @@ public class ItemInstance extends WorldObject // unequip if (isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance item : unequiped) + for (ItemInstance item : player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot())) { iu.addModifiedItem(item); } @@ -1873,9 +1872,8 @@ public class ItemInstance extends WorldObject { if (isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance item : unequiped) + for (ItemInstance item : player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot())) { iu.addModifiedItem(item); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/GameClient.java index 99c66513d8..d42e5bf53a 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/GameClient.java @@ -21,6 +21,7 @@ import java.net.InetSocketAddress; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; +import java.util.List; import java.util.concurrent.locks.ReentrantLock; import java.util.logging.Level; import java.util.logging.Logger; @@ -78,7 +79,7 @@ public class GameClient extends ChannelInboundHandler private PlayerInstance _player; private SecondaryPasswordAuth _secondaryAuth; private ClientHardwareInfoHolder _hardwareInfo; - private CharSelectInfoPackage[] _charSlotMapping = null; + private List _charSlotMapping = null; private volatile boolean _isDetached = false; private boolean _isAuthedGG; private boolean _protocolOk; @@ -568,21 +569,18 @@ public class GameClient extends ChannelInboundHandler return player; } - /** - * @param chars - */ - public void setCharSelection(CharSelectInfoPackage[] chars) + public void setCharSelection(List characters) { - _charSlotMapping = chars; + _charSlotMapping = characters; } public CharSelectInfoPackage getCharSelection(int charslot) { - if ((_charSlotMapping == null) || (charslot < 0) || (charslot >= _charSlotMapping.length)) + if ((_charSlotMapping == null) || (charslot < 0) || (charslot >= _charSlotMapping.size())) { return null; } - return _charSlotMapping[charslot]; + return _charSlotMapping.get(charslot); } public SecondaryPasswordAuth getSecondaryAuth() diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 4e8ed724b1..1e1ea92d19 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -202,9 +202,8 @@ public class RequestCrystallizeItem implements IClientIncomingPacket SystemMessage sm; if (itemToRemove.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance item : unequiped) + for (ItemInstance item : player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot())) { iu.addModifiedItem(item); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 0f8f2ab22f..3541ad4b56 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -193,9 +193,8 @@ public class RequestDestroyItem implements IClientIncomingPacket client.sendPacket(sm); } - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 4c71064b0b..3b17a2708f 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -311,12 +311,10 @@ public class RequestEnchantItem implements IClientIncomingPacket client.sendPacket(sm); } - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot()); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot())) { iu.addModifiedItem(itm); } - player.sendInventoryUpdate(iu); player.broadcastUserInfo(); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java index 730bd1b8f7..2bc2964039 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.clan.Clan.RankPrivs; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.PledgePowerGradeList; @@ -47,8 +46,7 @@ public class RequestPledgePowerGradeList implements IClientIncomingPacket final Clan clan = player.getClan(); if (clan != null) { - final RankPrivs[] privs = clan.getAllRankPrivs(); - player.sendPacket(new PledgePowerGradeList(privs)); + player.sendPacket(new PledgePowerGradeList(clan.getAllRankPrivs())); } } } \ No newline at end of file diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java index 0933d607bd..21176be244 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java @@ -109,8 +109,7 @@ public class RequestRefine extends AbstractRefinePacket final InventoryUpdate iu = new InventoryUpdate(); if (targetItem.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot()); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java index 240322a5da..a420f830b1 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java @@ -92,8 +92,7 @@ public class RequestRefineCancel implements IClientIncomingPacket final InventoryUpdate iu = new InventoryUpdate(); if (targetItem.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot()); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index f1cc81e68a..629cb64bc7 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.Arrays; +import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.PlayerCondOverride; @@ -99,27 +99,28 @@ public class RequestUnEquipItem implements IClientIncomingPacket return; } - final ItemInstance[] unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); player.broadcastUserInfo(); // This can be 0 if the user pressed the right mouse button twice very fast. - if (unequipped.length > 0) + if (!unequipped.isEmpty()) { SystemMessage sm = null; - if (unequipped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED); - sm.addInt(unequipped[0].getEnchantLevel()); + sm.addInt(unequippedItem.getEnchantLevel()); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); } - sm.addItemName(unequipped[0]); + sm.addItemName(unequippedItem); client.sendPacket(sm); final InventoryUpdate iu = new InventoryUpdate(); - iu.addItems(Arrays.asList(unequipped)); + iu.addItems(unequipped); player.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java index c3f5f4b0fa..7e27d26e1c 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java @@ -69,7 +69,7 @@ public abstract class AbstractInventoryUpdate extends AbstractItemPacket _items.put(item.getObjectId(), new ItemInfo(item, 3)); } - public void addItems(List items) + public void addItems(Collection items) { for (ItemInstance item : items) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 24af521ca5..3098adfb6f 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -48,7 +48,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket private final String _loginName; private final int _sessionId; private int _activeId; - private final CharSelectInfoPackage[] _characterPackages; + private final List _characterPackages; private static final int[] PAPERDOLL_ORDER = new int[] { @@ -148,7 +148,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket _activeId = activeId; } - public CharSelectInfoPackage[] getCharInfo() + public List getCharInfo() { return _characterPackages; } @@ -158,7 +158,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket { OutgoingPackets.CHARACTER_SELECTION_INFO.writeId(packet); - final int size = _characterPackages.length; + final int size = _characterPackages.size(); packet.writeD(size); // Created character count packet.writeD(Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT); // Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) ) @@ -197,9 +197,9 @@ public class CharSelectionInfo implements IClientOutgoingPacket { for (int i = 0; i < size; i++) { - if (lastAccess < _characterPackages[i].getLastAccess()) + if (lastAccess < _characterPackages.get(i).getLastAccess()) { - lastAccess = _characterPackages[i].getLastAccess(); + lastAccess = _characterPackages.get(i).getLastAccess(); _activeId = i; } } @@ -207,7 +207,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket for (int i = 0; i < size; i++) { - final CharSelectInfoPackage charInfoPackage = _characterPackages[i]; + final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i); packet.writeS(charInfoPackage.getName()); // Character name packet.writeD(charInfoPackage.getObjectId()); // Character ID packet.writeS(_loginName); // Account name @@ -307,7 +307,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket return true; } - private static CharSelectInfoPackage[] loadCharacterSelectInfo(String loginName) + private static List loadCharacterSelectInfo(String loginName) { CharSelectInfoPackage charInfopackage; final List characterList = new LinkedList<>(); @@ -333,13 +333,13 @@ public class CharSelectionInfo implements IClientOutgoingPacket } } } - return characterList.toArray(new CharSelectInfoPackage[characterList.size()]); } catch (Exception e) { LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } - return new CharSelectInfoPackage[0]; + + return characterList; } private static void loadCharacterSubclassInfo(CharSelectInfoPackage charInfopackage, int objectId, int activeClassId) diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java index 20d42578b2..4ae5ffe316 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.clan.Clan; @@ -39,12 +41,12 @@ public class ExPledgeRecruitInfo implements IClientOutgoingPacket { OutgoingPackets.EX_PLEDGE_RECRUIT_INFO.writeId(packet); - final SubPledge[] subPledges = _clan.getAllSubPledges(); + final Collection subPledges = _clan.getAllSubPledges(); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); packet.writeD(_clan.getLevel()); packet.writeD(_clan.getMembersCount()); - packet.writeD(subPledges.length); + packet.writeD(subPledges.size()); for (SubPledge subPledge : subPledges) { packet.writeD(subPledge.getId()); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java index cb2e18edb9..fce9f86d25 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java @@ -16,15 +16,17 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan.RankPrivs; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PledgePowerGradeList implements IClientOutgoingPacket { - private final RankPrivs[] _privs; + private final Collection _privs; - public PledgePowerGradeList(RankPrivs[] privs) + public PledgePowerGradeList(Collection privs) { _privs = privs; } @@ -33,8 +35,7 @@ public class PledgePowerGradeList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_POWER_GRADE_LIST.writeId(packet); - - packet.writeD(_privs.length); + packet.writeD(_privs.size()); for (RankPrivs temp : _privs) { packet.writeD(temp.getRank()); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java index eab507b686..591ab8690a 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java @@ -16,6 +16,9 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; +import java.util.List; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.skills.Skill; @@ -26,8 +29,8 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class PledgeSkillList implements IClientOutgoingPacket { - private final Skill[] _skills; - private final SubPledgeSkill[] _subSkills; + private final Collection _skills; + private final List _subSkills; public static class SubPledgeSkill { @@ -53,9 +56,8 @@ public class PledgeSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SKILL_LIST.writeId(packet); - - packet.writeD(_skills.length); - packet.writeD(_subSkills.length); // Squad skill length + packet.writeD(_skills.size()); + packet.writeD(_subSkills.size()); // Squad skill length for (Skill sk : _skills) { packet.writeD(sk.getDisplayId()); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java index 88a45c71fc..38f43a3fe0 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java @@ -48,7 +48,7 @@ public class PrivateStoreListSell extends AbstractItemPacket packet.writeD(_seller.getSellList().isPackaged() ? 1 : 0); packet.writeQ(_player.getAdena()); packet.writeD(0x00); - packet.writeD(_seller.getSellList().getItems().length); + packet.writeD(_seller.getSellList().getItems().size()); for (TradeItem item : _seller.getSellList().getItems()) { writeItem(packet, item); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index e180102d7f..56dee576c2 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -30,7 +30,7 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket private final int _objId; private final long _playerAdena; private final Collection _itemList; - private final TradeItem[] _buyList; + private final Collection _buyList; public PrivateStoreManageListBuy(int sendType, PlayerInstance player) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java index dfdbbb1524..724eb8998b 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java @@ -30,7 +30,7 @@ public class PrivateStoreManageListSell extends AbstractItemPacket private final long _playerAdena; private final boolean _packageSale; private final Collection _itemList; - private final TradeItem[] _sellList; + private final Collection _sellList; public PrivateStoreManageListSell(int sendType, PlayerInstance player, boolean isPackageSale) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java index 5bb5356fd0..e7a3655f52 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -23,7 +25,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ShortCutInit implements IClientOutgoingPacket { - private Shortcut[] _shortCuts; + private Collection _shortCuts; public ShortCutInit(PlayerInstance player) { @@ -40,7 +42,7 @@ public class ShortCutInit implements IClientOutgoingPacket { OutgoingPackets.SHORT_CUT_INIT.writeId(packet); - packet.writeD(_shortCuts.length); + packet.writeD(_shortCuts.size()); for (Shortcut sc : _shortCuts) { packet.writeD(sc.getType().ordinal()); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java index 7e32d855fe..bfb530ca83 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets.attributechange; +import java.util.List; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -26,13 +28,13 @@ import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket; */ public class ExChangeAttributeItemList extends AbstractItemPacket { - private final ItemInfo[] _itemsList; + private final List _itemsList; private final int _itemId; - public ExChangeAttributeItemList(int itemId, ItemInfo[] itemsList) + public ExChangeAttributeItemList(int itemId, List itemList) { _itemId = itemId; - _itemsList = itemsList; + _itemsList = itemList; } @Override @@ -40,7 +42,7 @@ public class ExChangeAttributeItemList extends AbstractItemPacket { OutgoingPackets.EX_CHANGE_ATTRIBUTE_ITEM_LIST.writeId(packet); packet.writeD(_itemId); - packet.writeD(_itemsList.length); + packet.writeD(_itemsList.size()); for (ItemInfo item : _itemsList) { writeItem(packet, item); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java index 771c0e3848..a34595ca73 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java @@ -594,9 +594,8 @@ public class AdminMobGroup implements IAdminCommandHandler private void showGroupList(PlayerInstance activeChar) { - final MobGroup[] mobGroupList = MobGroupTable.getInstance().getGroups(); BuilderUtil.sendSysMessage(activeChar, "======= ======="); - for (MobGroup mobGroup : mobGroupList) + for (MobGroup mobGroup : MobGroupTable.getInstance().getGroups()) { activeChar.sendMessage(mobGroup.getGroupId() + ": " + mobGroup.getActiveMobCount() + " alive out of " + mobGroup.getMaxMobCount() + " of NPC ID " + mobGroup.getTemplate().getId() + " (" + mobGroup.getStatus() + ")"); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java index 11c52819e5..636639079c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java @@ -99,9 +99,8 @@ public class ItemAuctionLink implements IBypassHandler } else if ("cancel".equalsIgnoreCase(cmd)) { - final ItemAuction[] auctions = au.getAuctionsByBidder(player.getObjectId()); boolean returned = false; - for (ItemAuction auction : auctions) + for (ItemAuction auction : au.getAuctionsByBidder(player.getObjectId())) { if (auction.cancelBid(player)) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index 4e27548f49..7ebe1e6ff5 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -16,6 +16,8 @@ */ package handlers.effecthandlers; +import java.util.List; + import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -84,7 +86,7 @@ public class ConvertItem extends AbstractEffect final int enchantLevel = wpn.getEnchantLevel(); final AttributeHolder elementals = wpn.getAttributes() == null ? null : wpn.getAttackAttribute(); - final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (ItemInstance unequippedItem : unequiped) { @@ -92,10 +94,11 @@ public class ConvertItem extends AbstractEffect } player.sendInventoryUpdate(iu); - if (unequiped.length <= 0) + if (unequiped.isEmpty()) { return; } + byte count = 0; for (ItemInstance unequippedItem : unequiped) { @@ -120,7 +123,7 @@ public class ConvertItem extends AbstractEffect player.sendPacket(sm); } - if (count == unequiped.length) + if (count == unequiped.size()) { return; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index 90d1568c8c..9c56971dcb 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -16,6 +16,7 @@ */ package handlers.effecthandlers; +import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -67,11 +68,11 @@ public class Disarmor extends AbstractEffect } final PlayerInstance player = effected.getActingPlayer(); - final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); - if (unequiped.length > 0) + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); + if (!unequipped.isEmpty()) { final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : unequipped) { iu.addModifiedItem(itm); } @@ -79,20 +80,21 @@ public class Disarmor extends AbstractEffect player.broadcastUserInfo(); SystemMessage sm = null; - if (unequiped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED); - sm.addInt(unequiped[0].getEnchantLevel()); - sm.addItemName(unequiped[0]); + sm.addInt(unequippedItem.getEnchantLevel()); + sm.addItemName(unequippedItem); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); - sm.addItemName(unequiped[0]); + sm.addItemName(unequippedItem); } player.sendPacket(sm); effected.getInventory().blockItemSlot(_slot); - _unequippedItems.put(effected.getObjectId(), unequiped[0].getObjectId()); + _unequippedItems.put(effected.getObjectId(), unequippedItem.getObjectId()); } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 19954820bc..119a616831 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -82,7 +82,7 @@ public class ChangeAttributeCrystal implements IItemHandler return false; } - player.sendPacket(new ExChangeAttributeItemList(item.getId(), itemList.toArray(new ItemInfo[itemList.size()]))); + player.sendPacket(new ExChangeAttributeItemList(item.getId(), itemList)); return true; } } \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/MacroList.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/MacroList.java index 2411db329d..ead95f13ea 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/MacroList.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/MacroList.java @@ -90,8 +90,7 @@ public class MacroList implements IRestorable deleteMacroFromDb(removed); } - final Shortcut[] allShortCuts = _owner.getAllShortCuts(); - for (Shortcut sc : allShortCuts) + for (Shortcut sc : _owner.getAllShortCuts()) { if ((sc.getId() == id) && (sc.getType() == ShortcutType.MACRO)) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/MobGroupTable.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/MobGroupTable.java index 244fd07964..e61d726687 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/MobGroupTable.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/MobGroupTable.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.model; +import java.util.Collection; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -67,9 +68,9 @@ public class MobGroupTable return null; } - public MobGroup[] getGroups() + public Collection getGroups() { - return _groupMap.values().toArray(new MobGroup[_groupMap.size()]); + return _groupMap.values(); } public boolean removeGroup(int groupKey) diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ShortCuts.java index 8cf01b5f4f..da9c30d0d0 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; +import java.util.Collection; import java.util.Map; import java.util.TreeMap; import java.util.logging.Level; @@ -46,9 +47,9 @@ public class ShortCuts implements IRestorable _owner = owner; } - public Shortcut[] getAllShortCuts() + public Collection getAllShortCuts() { - return _shortCuts.values().toArray(new Shortcut[_shortCuts.values().size()]); + return _shortCuts.values(); } public Shortcut getShortCut(int slot, int page) diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TradeList.java index 73ac57f840..114e3f112b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TradeList.java @@ -107,9 +107,9 @@ public class TradeList /** * @return all items from TradeList */ - public TradeItem[] getItems() + public Collection getItems() { - return _items.toArray(new TradeItem[_items.size()]); + return _items; } /** @@ -863,7 +863,7 @@ public class TradeList final InventoryUpdate playerIU = new InventoryUpdate(); long totalPrice = 0; - final TradeItem[] sellerItems = _items.toArray(new TradeItem[0]); + final TradeItem[] sellerItems = _items.toArray(new TradeItem[_items.size()]); for (ItemRequest item : requestedItems) { // searching item in tradelist using itemId diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index e9a7d23f54..6acd6c1c7d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1583,9 +1583,9 @@ public class PlayerInstance extends Playable } /** - * @return a table containing all ShortCut of the PlayerInstance. + * @return a collection containing all ShortCut of the PlayerInstance. */ - public Shortcut[] getAllShortCuts() + public Collection getAllShortCuts() { return _shortCuts.getAllShortCuts(); } @@ -2156,7 +2156,7 @@ public class PlayerInstance extends Playable } // Equip or unEquip - ItemInstance[] items = null; + List items = null; final boolean isEquiped = item.isEquipped(); final int oldInvLimit = getInventoryLimit(); SystemMessage sm = null; @@ -2224,7 +2224,7 @@ public class PlayerInstance extends Playable broadcastUserInfo(); final InventoryUpdate iu = new InventoryUpdate(); - iu.addItems(Arrays.asList(items)); + iu.addItems(items); sendInventoryUpdate(iu); if (abortAttack) @@ -5804,9 +5804,9 @@ public class PlayerInstance extends Playable return false; } - final ItemInstance[] unequiped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : unequipped) { iu.addModifiedItem(itm); } @@ -5816,19 +5816,20 @@ public class PlayerInstance extends Playable broadcastUserInfo(); // This can be 0 if the user pressed the right mousebutton twice very fast. - if (unequiped.length > 0) + if (!unequipped.isEmpty()) { final SystemMessage sm; - if (unequiped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED); - sm.addInt(unequiped[0].getEnchantLevel()); - sm.addItemName(unequiped[0]); + sm.addInt(unequippedItem.getEnchantLevel()); + sm.addItemName(unequippedItem); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); - sm.addItemName(unequiped[0]); + sm.addItemName(unequippedItem); } sendPacket(sm); } @@ -5844,9 +5845,9 @@ public class PlayerInstance extends Playable final ItemInstance sld = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (sld != null) { - final ItemInstance[] unequiped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : unequipped) { iu.addModifiedItem(itm); } @@ -5856,19 +5857,20 @@ public class PlayerInstance extends Playable broadcastUserInfo(); // this can be 0 if the user pressed the right mousebutton twice very fast - if (unequiped.length > 0) + if (!unequipped.isEmpty()) { SystemMessage sm = null; - if (unequiped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED); - sm.addInt(unequiped[0].getEnchantLevel()); - sm.addItemName(unequiped[0]); + sm.addInt(unequippedItem.getEnchantLevel()); + sm.addItemName(unequippedItem); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); - sm.addItemName(unequiped[0]); + sm.addItemName(unequippedItem); } sendPacket(sm); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/Clan.java index 9c70a2b61c..14935a25d9 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -1199,9 +1199,9 @@ public class Clan implements IIdentifiable, INamable /** * @return all the clan skills. */ - public Skill[] getAllSkills() + public Collection getAllSkills() { - return _skills.values().toArray(new Skill[_skills.values().size()]); + return _skills.values(); } /** @@ -1755,9 +1755,9 @@ public class Clan implements IIdentifiable, INamable * Used to retrieve all subPledges * @return */ - public SubPledge[] getAllSubPledges() + public Collection getAllSubPledges() { - return _subPledges.values().toArray(new SubPledge[_subPledges.values().size()]); + return _subPledges.values(); } public SubPledge createSubPledge(int pledgeType) @@ -1909,9 +1909,9 @@ public class Clan implements IIdentifiable, INamable /** * @return all RankPrivs. */ - public RankPrivs[] getAllRankPrivs() + public Collection getAllRankPrivs() { - return _privs.values().toArray(new RankPrivs[_privs.values().size()]); + return _privs.values(); } public int getLeaderSubPledge(int leaderId) @@ -2572,7 +2572,7 @@ public class Clan implements IIdentifiable, INamable return false; } - public SubPledgeSkill[] getAllSubSkills() + public List getAllSubSkills() { final List list = new LinkedList<>(); for (Skill skill : _subPledgeSkills.values()) @@ -2586,7 +2586,7 @@ public class Clan implements IIdentifiable, INamable list.add(new SubPledgeSkill(subunit.getId(), skill.getId(), skill.getLevel())); } } - return list.toArray(new SubPledgeSkill[list.size()]); + return list; } public void setNewLeaderId(int objectId, boolean storeInDb) diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 8f195b1ba9..8c3f3b5bfd 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -2963,9 +2963,8 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime // Destroy the quantity of items wanted if (item.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(item.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInBodySlotAndRecord(item.getItem().getBodyPart())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index f14581064a..0161150ecb 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -347,7 +347,7 @@ public class ItemAuctionInstance return _auctions.get(auctionId); } - public ItemAuction[] getAuctionsByBidder(int bidderObjId) + public ArrayList getAuctionsByBidder(int bidderObjId) { final Collection auctions = getAuctions(); final ArrayList stack = new ArrayList<>(auctions.size()); @@ -362,7 +362,7 @@ public class ItemAuctionInstance } } } - return stack.toArray(new ItemAuction[stack.size()]); + return stack; } public Collection getAuctions() diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index affda3e80e..521bdf9606 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -25,8 +25,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; import java.util.function.Predicate; import java.util.logging.Level; @@ -174,7 +172,7 @@ public abstract class Inventory extends ItemContainer private static final class ChangeRecorder implements PaperdollListener { private final Inventory _inventory; - private final Set _changed = ConcurrentHashMap.newKeySet(); + private final List _changed = new ArrayList<>(1); /** * Constructor of the ChangeRecorder @@ -214,9 +212,9 @@ public abstract class Inventory extends ItemContainer * Returns alterations in inventory * @return ItemInstance[] : array of altered items */ - public ItemInstance[] getChangedItems() + public List getChangedItems() { - return _changed.toArray(new ItemInstance[_changed.size()]); + return _changed; } } @@ -1739,12 +1737,11 @@ public abstract class Inventory extends ItemContainer * Unequips item in body slot and returns alterations.
* If you dont need return value use {@link Inventory#unEquipItemInBodySlot(long)} instead * @param slot : int designating the slot of the paperdoll - * @return ItemInstance[] : list of changes + * @return List : List of changes */ - public ItemInstance[] unEquipItemInBodySlotAndRecord(long slot) + public List unEquipItemInBodySlotAndRecord(long slot) { final ChangeRecorder recorder = newRecorder(); - try { unEquipItemInBodySlot(slot); @@ -1770,12 +1767,11 @@ public abstract class Inventory extends ItemContainer * Unequips item in slot and returns alterations
* If you dont need return value use {@link Inventory#unEquipItemInSlot(int)} instead * @param slot : int designating the slot - * @return ItemInstance[] : list of items altered + * @return List : List of items altered */ - public ItemInstance[] unEquipItemInSlotAndRecord(int slot) + public List unEquipItemInSlotAndRecord(int slot) { final ChangeRecorder recorder = newRecorder(); - try { unEquipItemInSlot(slot); @@ -1916,12 +1912,11 @@ public abstract class Inventory extends ItemContainer * Equips item and returns list of alterations
* If you don't need return value use {@link Inventory#equipItem(ItemInstance)} instead * @param item : ItemInstance corresponding to the item - * @return ItemInstance[] : list of alterations + * @return List : List of alterations */ - public ItemInstance[] equipItemAndRecord(ItemInstance item) + public List equipItemAndRecord(ItemInstance item) { final ChangeRecorder recorder = newRecorder(); - try { equipItem(item); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java index 8943842d96..e83c19f0fc 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -1437,9 +1437,8 @@ public class ItemInstance extends WorldObject // unequip if (isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance item : unequiped) + for (ItemInstance item : player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot())) { iu.addModifiedItem(item); } @@ -1873,9 +1872,8 @@ public class ItemInstance extends WorldObject { if (isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance item : unequiped) + for (ItemInstance item : player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot())) { iu.addModifiedItem(item); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/GameClient.java index 99c66513d8..d42e5bf53a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/GameClient.java @@ -21,6 +21,7 @@ import java.net.InetSocketAddress; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; +import java.util.List; import java.util.concurrent.locks.ReentrantLock; import java.util.logging.Level; import java.util.logging.Logger; @@ -78,7 +79,7 @@ public class GameClient extends ChannelInboundHandler private PlayerInstance _player; private SecondaryPasswordAuth _secondaryAuth; private ClientHardwareInfoHolder _hardwareInfo; - private CharSelectInfoPackage[] _charSlotMapping = null; + private List _charSlotMapping = null; private volatile boolean _isDetached = false; private boolean _isAuthedGG; private boolean _protocolOk; @@ -568,21 +569,18 @@ public class GameClient extends ChannelInboundHandler return player; } - /** - * @param chars - */ - public void setCharSelection(CharSelectInfoPackage[] chars) + public void setCharSelection(List characters) { - _charSlotMapping = chars; + _charSlotMapping = characters; } public CharSelectInfoPackage getCharSelection(int charslot) { - if ((_charSlotMapping == null) || (charslot < 0) || (charslot >= _charSlotMapping.length)) + if ((_charSlotMapping == null) || (charslot < 0) || (charslot >= _charSlotMapping.size())) { return null; } - return _charSlotMapping[charslot]; + return _charSlotMapping.get(charslot); } public SecondaryPasswordAuth getSecondaryAuth() diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 927ec4e407..f77b83cc31 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -204,9 +204,8 @@ public class RequestCrystallizeItem implements IClientIncomingPacket SystemMessage sm; if (itemToRemove.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance item : unequiped) + for (ItemInstance item : player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot())) { iu.addModifiedItem(item); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 0f8f2ab22f..3541ad4b56 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -193,9 +193,8 @@ public class RequestDestroyItem implements IClientIncomingPacket client.sendPacket(sm); } - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 4fbde86e9d..322fefc438 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -311,12 +311,10 @@ public class RequestEnchantItem implements IClientIncomingPacket client.sendPacket(sm); } - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot()); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot())) { iu.addModifiedItem(itm); } - player.sendInventoryUpdate(iu); player.broadcastUserInfo(); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java index 730bd1b8f7..2bc2964039 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.clan.Clan.RankPrivs; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.PledgePowerGradeList; @@ -47,8 +46,7 @@ public class RequestPledgePowerGradeList implements IClientIncomingPacket final Clan clan = player.getClan(); if (clan != null) { - final RankPrivs[] privs = clan.getAllRankPrivs(); - player.sendPacket(new PledgePowerGradeList(privs)); + player.sendPacket(new PledgePowerGradeList(clan.getAllRankPrivs())); } } } \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java index 0933d607bd..21176be244 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java @@ -109,8 +109,7 @@ public class RequestRefine extends AbstractRefinePacket final InventoryUpdate iu = new InventoryUpdate(); if (targetItem.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot()); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java index 240322a5da..a420f830b1 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java @@ -92,8 +92,7 @@ public class RequestRefineCancel implements IClientIncomingPacket final InventoryUpdate iu = new InventoryUpdate(); if (targetItem.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot()); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index f1cc81e68a..629cb64bc7 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.Arrays; +import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.PlayerCondOverride; @@ -99,27 +99,28 @@ public class RequestUnEquipItem implements IClientIncomingPacket return; } - final ItemInstance[] unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); player.broadcastUserInfo(); // This can be 0 if the user pressed the right mouse button twice very fast. - if (unequipped.length > 0) + if (!unequipped.isEmpty()) { SystemMessage sm = null; - if (unequipped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED); - sm.addInt(unequipped[0].getEnchantLevel()); + sm.addInt(unequippedItem.getEnchantLevel()); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); } - sm.addItemName(unequipped[0]); + sm.addItemName(unequippedItem); client.sendPacket(sm); final InventoryUpdate iu = new InventoryUpdate(); - iu.addItems(Arrays.asList(unequipped)); + iu.addItems(unequipped); player.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java index c3f5f4b0fa..7e27d26e1c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java @@ -69,7 +69,7 @@ public abstract class AbstractInventoryUpdate extends AbstractItemPacket _items.put(item.getObjectId(), new ItemInfo(item, 3)); } - public void addItems(List items) + public void addItems(Collection items) { for (ItemInstance item : items) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 24af521ca5..3098adfb6f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -48,7 +48,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket private final String _loginName; private final int _sessionId; private int _activeId; - private final CharSelectInfoPackage[] _characterPackages; + private final List _characterPackages; private static final int[] PAPERDOLL_ORDER = new int[] { @@ -148,7 +148,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket _activeId = activeId; } - public CharSelectInfoPackage[] getCharInfo() + public List getCharInfo() { return _characterPackages; } @@ -158,7 +158,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket { OutgoingPackets.CHARACTER_SELECTION_INFO.writeId(packet); - final int size = _characterPackages.length; + final int size = _characterPackages.size(); packet.writeD(size); // Created character count packet.writeD(Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT); // Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) ) @@ -197,9 +197,9 @@ public class CharSelectionInfo implements IClientOutgoingPacket { for (int i = 0; i < size; i++) { - if (lastAccess < _characterPackages[i].getLastAccess()) + if (lastAccess < _characterPackages.get(i).getLastAccess()) { - lastAccess = _characterPackages[i].getLastAccess(); + lastAccess = _characterPackages.get(i).getLastAccess(); _activeId = i; } } @@ -207,7 +207,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket for (int i = 0; i < size; i++) { - final CharSelectInfoPackage charInfoPackage = _characterPackages[i]; + final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i); packet.writeS(charInfoPackage.getName()); // Character name packet.writeD(charInfoPackage.getObjectId()); // Character ID packet.writeS(_loginName); // Account name @@ -307,7 +307,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket return true; } - private static CharSelectInfoPackage[] loadCharacterSelectInfo(String loginName) + private static List loadCharacterSelectInfo(String loginName) { CharSelectInfoPackage charInfopackage; final List characterList = new LinkedList<>(); @@ -333,13 +333,13 @@ public class CharSelectionInfo implements IClientOutgoingPacket } } } - return characterList.toArray(new CharSelectInfoPackage[characterList.size()]); } catch (Exception e) { LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } - return new CharSelectInfoPackage[0]; + + return characterList; } private static void loadCharacterSubclassInfo(CharSelectInfoPackage charInfopackage, int objectId, int activeClassId) diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java index 20d42578b2..4ae5ffe316 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.clan.Clan; @@ -39,12 +41,12 @@ public class ExPledgeRecruitInfo implements IClientOutgoingPacket { OutgoingPackets.EX_PLEDGE_RECRUIT_INFO.writeId(packet); - final SubPledge[] subPledges = _clan.getAllSubPledges(); + final Collection subPledges = _clan.getAllSubPledges(); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); packet.writeD(_clan.getLevel()); packet.writeD(_clan.getMembersCount()); - packet.writeD(subPledges.length); + packet.writeD(subPledges.size()); for (SubPledge subPledge : subPledges) { packet.writeD(subPledge.getId()); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java index cb2e18edb9..fce9f86d25 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java @@ -16,15 +16,17 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan.RankPrivs; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PledgePowerGradeList implements IClientOutgoingPacket { - private final RankPrivs[] _privs; + private final Collection _privs; - public PledgePowerGradeList(RankPrivs[] privs) + public PledgePowerGradeList(Collection privs) { _privs = privs; } @@ -33,8 +35,7 @@ public class PledgePowerGradeList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_POWER_GRADE_LIST.writeId(packet); - - packet.writeD(_privs.length); + packet.writeD(_privs.size()); for (RankPrivs temp : _privs) { packet.writeD(temp.getRank()); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java index eab507b686..591ab8690a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java @@ -16,6 +16,9 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; +import java.util.List; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.skills.Skill; @@ -26,8 +29,8 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class PledgeSkillList implements IClientOutgoingPacket { - private final Skill[] _skills; - private final SubPledgeSkill[] _subSkills; + private final Collection _skills; + private final List _subSkills; public static class SubPledgeSkill { @@ -53,9 +56,8 @@ public class PledgeSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SKILL_LIST.writeId(packet); - - packet.writeD(_skills.length); - packet.writeD(_subSkills.length); // Squad skill length + packet.writeD(_skills.size()); + packet.writeD(_subSkills.size()); // Squad skill length for (Skill sk : _skills) { packet.writeD(sk.getDisplayId()); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java index 88a45c71fc..38f43a3fe0 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java @@ -48,7 +48,7 @@ public class PrivateStoreListSell extends AbstractItemPacket packet.writeD(_seller.getSellList().isPackaged() ? 1 : 0); packet.writeQ(_player.getAdena()); packet.writeD(0x00); - packet.writeD(_seller.getSellList().getItems().length); + packet.writeD(_seller.getSellList().getItems().size()); for (TradeItem item : _seller.getSellList().getItems()) { writeItem(packet, item); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index e180102d7f..56dee576c2 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -30,7 +30,7 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket private final int _objId; private final long _playerAdena; private final Collection _itemList; - private final TradeItem[] _buyList; + private final Collection _buyList; public PrivateStoreManageListBuy(int sendType, PlayerInstance player) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java index dfdbbb1524..724eb8998b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java @@ -30,7 +30,7 @@ public class PrivateStoreManageListSell extends AbstractItemPacket private final long _playerAdena; private final boolean _packageSale; private final Collection _itemList; - private final TradeItem[] _sellList; + private final Collection _sellList; public PrivateStoreManageListSell(int sendType, PlayerInstance player, boolean isPackageSale) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java index 751f688f0d..ca0e8e8296 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -23,7 +25,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ShortCutInit implements IClientOutgoingPacket { - private Shortcut[] _shortCuts; + private Collection _shortCuts; public ShortCutInit(PlayerInstance player) { @@ -40,7 +42,7 @@ public class ShortCutInit implements IClientOutgoingPacket { OutgoingPackets.SHORT_CUT_INIT.writeId(packet); - packet.writeD(_shortCuts.length); + packet.writeD(_shortCuts.size()); for (Shortcut sc : _shortCuts) { packet.writeD(sc.getType().ordinal()); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java index 7e32d855fe..bfb530ca83 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets.attributechange; +import java.util.List; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -26,13 +28,13 @@ import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket; */ public class ExChangeAttributeItemList extends AbstractItemPacket { - private final ItemInfo[] _itemsList; + private final List _itemsList; private final int _itemId; - public ExChangeAttributeItemList(int itemId, ItemInfo[] itemsList) + public ExChangeAttributeItemList(int itemId, List itemList) { _itemId = itemId; - _itemsList = itemsList; + _itemsList = itemList; } @Override @@ -40,7 +42,7 @@ public class ExChangeAttributeItemList extends AbstractItemPacket { OutgoingPackets.EX_CHANGE_ATTRIBUTE_ITEM_LIST.writeId(packet); packet.writeD(_itemId); - packet.writeD(_itemsList.length); + packet.writeD(_itemsList.size()); for (ItemInfo item : _itemsList) { writeItem(packet, item); diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java index 771c0e3848..a34595ca73 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java @@ -594,9 +594,8 @@ public class AdminMobGroup implements IAdminCommandHandler private void showGroupList(PlayerInstance activeChar) { - final MobGroup[] mobGroupList = MobGroupTable.getInstance().getGroups(); BuilderUtil.sendSysMessage(activeChar, "======= ======="); - for (MobGroup mobGroup : mobGroupList) + for (MobGroup mobGroup : MobGroupTable.getInstance().getGroups()) { activeChar.sendMessage(mobGroup.getGroupId() + ": " + mobGroup.getActiveMobCount() + " alive out of " + mobGroup.getMaxMobCount() + " of NPC ID " + mobGroup.getTemplate().getId() + " (" + mobGroup.getStatus() + ")"); } diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java index 11c52819e5..636639079c 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java @@ -99,9 +99,8 @@ public class ItemAuctionLink implements IBypassHandler } else if ("cancel".equalsIgnoreCase(cmd)) { - final ItemAuction[] auctions = au.getAuctionsByBidder(player.getObjectId()); boolean returned = false; - for (ItemAuction auction : auctions) + for (ItemAuction auction : au.getAuctionsByBidder(player.getObjectId())) { if (auction.cancelBid(player)) { diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index 4e27548f49..7ebe1e6ff5 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -16,6 +16,8 @@ */ package handlers.effecthandlers; +import java.util.List; + import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -84,7 +86,7 @@ public class ConvertItem extends AbstractEffect final int enchantLevel = wpn.getEnchantLevel(); final AttributeHolder elementals = wpn.getAttributes() == null ? null : wpn.getAttackAttribute(); - final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (ItemInstance unequippedItem : unequiped) { @@ -92,10 +94,11 @@ public class ConvertItem extends AbstractEffect } player.sendInventoryUpdate(iu); - if (unequiped.length <= 0) + if (unequiped.isEmpty()) { return; } + byte count = 0; for (ItemInstance unequippedItem : unequiped) { @@ -120,7 +123,7 @@ public class ConvertItem extends AbstractEffect player.sendPacket(sm); } - if (count == unequiped.length) + if (count == unequiped.size()) { return; } diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index 90d1568c8c..9c56971dcb 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -16,6 +16,7 @@ */ package handlers.effecthandlers; +import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -67,11 +68,11 @@ public class Disarmor extends AbstractEffect } final PlayerInstance player = effected.getActingPlayer(); - final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); - if (unequiped.length > 0) + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); + if (!unequipped.isEmpty()) { final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : unequipped) { iu.addModifiedItem(itm); } @@ -79,20 +80,21 @@ public class Disarmor extends AbstractEffect player.broadcastUserInfo(); SystemMessage sm = null; - if (unequiped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED); - sm.addInt(unequiped[0].getEnchantLevel()); - sm.addItemName(unequiped[0]); + sm.addInt(unequippedItem.getEnchantLevel()); + sm.addItemName(unequippedItem); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); - sm.addItemName(unequiped[0]); + sm.addItemName(unequippedItem); } player.sendPacket(sm); effected.getInventory().blockItemSlot(_slot); - _unequippedItems.put(effected.getObjectId(), unequiped[0].getObjectId()); + _unequippedItems.put(effected.getObjectId(), unequippedItem.getObjectId()); } } diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 19954820bc..119a616831 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -82,7 +82,7 @@ public class ChangeAttributeCrystal implements IItemHandler return false; } - player.sendPacket(new ExChangeAttributeItemList(item.getId(), itemList.toArray(new ItemInfo[itemList.size()]))); + player.sendPacket(new ExChangeAttributeItemList(item.getId(), itemList)); return true; } } \ No newline at end of file diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/MacroList.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/MacroList.java index 2411db329d..ead95f13ea 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/MacroList.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/MacroList.java @@ -90,8 +90,7 @@ public class MacroList implements IRestorable deleteMacroFromDb(removed); } - final Shortcut[] allShortCuts = _owner.getAllShortCuts(); - for (Shortcut sc : allShortCuts) + for (Shortcut sc : _owner.getAllShortCuts()) { if ((sc.getId() == id) && (sc.getType() == ShortcutType.MACRO)) { diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/MobGroupTable.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/MobGroupTable.java index 244fd07964..e61d726687 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/MobGroupTable.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/MobGroupTable.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.model; +import java.util.Collection; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -67,9 +68,9 @@ public class MobGroupTable return null; } - public MobGroup[] getGroups() + public Collection getGroups() { - return _groupMap.values().toArray(new MobGroup[_groupMap.size()]); + return _groupMap.values(); } public boolean removeGroup(int groupKey) diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/ShortCuts.java index 8cf01b5f4f..da9c30d0d0 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; +import java.util.Collection; import java.util.Map; import java.util.TreeMap; import java.util.logging.Level; @@ -46,9 +47,9 @@ public class ShortCuts implements IRestorable _owner = owner; } - public Shortcut[] getAllShortCuts() + public Collection getAllShortCuts() { - return _shortCuts.values().toArray(new Shortcut[_shortCuts.values().size()]); + return _shortCuts.values(); } public Shortcut getShortCut(int slot, int page) diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/TradeList.java index 73ac57f840..114e3f112b 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/TradeList.java @@ -107,9 +107,9 @@ public class TradeList /** * @return all items from TradeList */ - public TradeItem[] getItems() + public Collection getItems() { - return _items.toArray(new TradeItem[_items.size()]); + return _items; } /** @@ -863,7 +863,7 @@ public class TradeList final InventoryUpdate playerIU = new InventoryUpdate(); long totalPrice = 0; - final TradeItem[] sellerItems = _items.toArray(new TradeItem[0]); + final TradeItem[] sellerItems = _items.toArray(new TradeItem[_items.size()]); for (ItemRequest item : requestedItems) { // searching item in tradelist using itemId diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index a3f1297382..88a93ab26f 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1582,9 +1582,9 @@ public class PlayerInstance extends Playable } /** - * @return a table containing all ShortCut of the PlayerInstance. + * @return a collection containing all ShortCut of the PlayerInstance. */ - public Shortcut[] getAllShortCuts() + public Collection getAllShortCuts() { return _shortCuts.getAllShortCuts(); } @@ -2164,7 +2164,7 @@ public class PlayerInstance extends Playable } // Equip or unEquip - ItemInstance[] items = null; + List items = null; final boolean isEquiped = item.isEquipped(); final int oldInvLimit = getInventoryLimit(); SystemMessage sm = null; @@ -2232,7 +2232,7 @@ public class PlayerInstance extends Playable broadcastUserInfo(); final InventoryUpdate iu = new InventoryUpdate(); - iu.addItems(Arrays.asList(items)); + iu.addItems(items); sendInventoryUpdate(iu); if (abortAttack) @@ -5872,9 +5872,9 @@ public class PlayerInstance extends Playable return false; } - final ItemInstance[] unequiped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : unequipped) { iu.addModifiedItem(itm); } @@ -5884,19 +5884,20 @@ public class PlayerInstance extends Playable broadcastUserInfo(); // This can be 0 if the user pressed the right mousebutton twice very fast. - if (unequiped.length > 0) + if (!unequipped.isEmpty()) { final SystemMessage sm; - if (unequiped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED); - sm.addInt(unequiped[0].getEnchantLevel()); - sm.addItemName(unequiped[0]); + sm.addInt(unequippedItem.getEnchantLevel()); + sm.addItemName(unequippedItem); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); - sm.addItemName(unequiped[0]); + sm.addItemName(unequippedItem); } sendPacket(sm); } @@ -5912,9 +5913,9 @@ public class PlayerInstance extends Playable final ItemInstance sld = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (sld != null) { - final ItemInstance[] unequiped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : unequipped) { iu.addModifiedItem(itm); } @@ -5924,19 +5925,20 @@ public class PlayerInstance extends Playable broadcastUserInfo(); // this can be 0 if the user pressed the right mousebutton twice very fast - if (unequiped.length > 0) + if (!unequipped.isEmpty()) { SystemMessage sm = null; - if (unequiped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED); - sm.addInt(unequiped[0].getEnchantLevel()); - sm.addItemName(unequiped[0]); + sm.addInt(unequippedItem.getEnchantLevel()); + sm.addItemName(unequippedItem); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); - sm.addItemName(unequiped[0]); + sm.addItemName(unequippedItem); } sendPacket(sm); } diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/clan/Clan.java index 9c70a2b61c..14935a25d9 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -1199,9 +1199,9 @@ public class Clan implements IIdentifiable, INamable /** * @return all the clan skills. */ - public Skill[] getAllSkills() + public Collection getAllSkills() { - return _skills.values().toArray(new Skill[_skills.values().size()]); + return _skills.values(); } /** @@ -1755,9 +1755,9 @@ public class Clan implements IIdentifiable, INamable * Used to retrieve all subPledges * @return */ - public SubPledge[] getAllSubPledges() + public Collection getAllSubPledges() { - return _subPledges.values().toArray(new SubPledge[_subPledges.values().size()]); + return _subPledges.values(); } public SubPledge createSubPledge(int pledgeType) @@ -1909,9 +1909,9 @@ public class Clan implements IIdentifiable, INamable /** * @return all RankPrivs. */ - public RankPrivs[] getAllRankPrivs() + public Collection getAllRankPrivs() { - return _privs.values().toArray(new RankPrivs[_privs.values().size()]); + return _privs.values(); } public int getLeaderSubPledge(int leaderId) @@ -2572,7 +2572,7 @@ public class Clan implements IIdentifiable, INamable return false; } - public SubPledgeSkill[] getAllSubSkills() + public List getAllSubSkills() { final List list = new LinkedList<>(); for (Skill skill : _subPledgeSkills.values()) @@ -2586,7 +2586,7 @@ public class Clan implements IIdentifiable, INamable list.add(new SubPledgeSkill(subunit.getId(), skill.getId(), skill.getLevel())); } } - return list.toArray(new SubPledgeSkill[list.size()]); + return list; } public void setNewLeaderId(int objectId, boolean storeInDb) diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 8f195b1ba9..8c3f3b5bfd 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -2963,9 +2963,8 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime // Destroy the quantity of items wanted if (item.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(item.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInBodySlotAndRecord(item.getItem().getBodyPart())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index f14581064a..0161150ecb 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -347,7 +347,7 @@ public class ItemAuctionInstance return _auctions.get(auctionId); } - public ItemAuction[] getAuctionsByBidder(int bidderObjId) + public ArrayList getAuctionsByBidder(int bidderObjId) { final Collection auctions = getAuctions(); final ArrayList stack = new ArrayList<>(auctions.size()); @@ -362,7 +362,7 @@ public class ItemAuctionInstance } } } - return stack.toArray(new ItemAuction[stack.size()]); + return stack; } public Collection getAuctions() diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 042309385d..147d7386ae 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -25,8 +25,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; import java.util.function.Predicate; import java.util.logging.Level; @@ -173,7 +171,7 @@ public abstract class Inventory extends ItemContainer private static final class ChangeRecorder implements PaperdollListener { private final Inventory _inventory; - private final Set _changed = ConcurrentHashMap.newKeySet(); + private final List _changed = new ArrayList<>(1); /** * Constructor of the ChangeRecorder @@ -213,9 +211,9 @@ public abstract class Inventory extends ItemContainer * Returns alterations in inventory * @return ItemInstance[] : array of altered items */ - public ItemInstance[] getChangedItems() + public List getChangedItems() { - return _changed.toArray(new ItemInstance[_changed.size()]); + return _changed; } } @@ -1734,12 +1732,11 @@ public abstract class Inventory extends ItemContainer * Unequips item in body slot and returns alterations.
* If you dont need return value use {@link Inventory#unEquipItemInBodySlot(long)} instead * @param slot : int designating the slot of the paperdoll - * @return ItemInstance[] : list of changes + * @return List : List of changes */ - public ItemInstance[] unEquipItemInBodySlotAndRecord(long slot) + public List unEquipItemInBodySlotAndRecord(long slot) { final ChangeRecorder recorder = newRecorder(); - try { unEquipItemInBodySlot(slot); @@ -1765,12 +1762,11 @@ public abstract class Inventory extends ItemContainer * Unequips item in slot and returns alterations
* If you dont need return value use {@link Inventory#unEquipItemInSlot(int)} instead * @param slot : int designating the slot - * @return ItemInstance[] : list of items altered + * @return List : List of items altered */ - public ItemInstance[] unEquipItemInSlotAndRecord(int slot) + public List unEquipItemInSlotAndRecord(int slot) { final ChangeRecorder recorder = newRecorder(); - try { unEquipItemInSlot(slot); @@ -1911,12 +1907,11 @@ public abstract class Inventory extends ItemContainer * Equips item and returns list of alterations
* If you don't need return value use {@link Inventory#equipItem(ItemInstance)} instead * @param item : ItemInstance corresponding to the item - * @return ItemInstance[] : list of alterations + * @return List : List of alterations */ - public ItemInstance[] equipItemAndRecord(ItemInstance item) + public List equipItemAndRecord(ItemInstance item) { final ChangeRecorder recorder = newRecorder(); - try { equipItem(item); diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java index 8943842d96..e83c19f0fc 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -1437,9 +1437,8 @@ public class ItemInstance extends WorldObject // unequip if (isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance item : unequiped) + for (ItemInstance item : player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot())) { iu.addModifiedItem(item); } @@ -1873,9 +1872,8 @@ public class ItemInstance extends WorldObject { if (isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance item : unequiped) + for (ItemInstance item : player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot())) { iu.addModifiedItem(item); } diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/GameClient.java index 99c66513d8..d42e5bf53a 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/GameClient.java @@ -21,6 +21,7 @@ import java.net.InetSocketAddress; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; +import java.util.List; import java.util.concurrent.locks.ReentrantLock; import java.util.logging.Level; import java.util.logging.Logger; @@ -78,7 +79,7 @@ public class GameClient extends ChannelInboundHandler private PlayerInstance _player; private SecondaryPasswordAuth _secondaryAuth; private ClientHardwareInfoHolder _hardwareInfo; - private CharSelectInfoPackage[] _charSlotMapping = null; + private List _charSlotMapping = null; private volatile boolean _isDetached = false; private boolean _isAuthedGG; private boolean _protocolOk; @@ -568,21 +569,18 @@ public class GameClient extends ChannelInboundHandler return player; } - /** - * @param chars - */ - public void setCharSelection(CharSelectInfoPackage[] chars) + public void setCharSelection(List characters) { - _charSlotMapping = chars; + _charSlotMapping = characters; } public CharSelectInfoPackage getCharSelection(int charslot) { - if ((_charSlotMapping == null) || (charslot < 0) || (charslot >= _charSlotMapping.length)) + if ((_charSlotMapping == null) || (charslot < 0) || (charslot >= _charSlotMapping.size())) { return null; } - return _charSlotMapping[charslot]; + return _charSlotMapping.get(charslot); } public SecondaryPasswordAuth getSecondaryAuth() diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 927ec4e407..f77b83cc31 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -204,9 +204,8 @@ public class RequestCrystallizeItem implements IClientIncomingPacket SystemMessage sm; if (itemToRemove.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance item : unequiped) + for (ItemInstance item : player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot())) { iu.addModifiedItem(item); } diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 0f8f2ab22f..3541ad4b56 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -193,9 +193,8 @@ public class RequestDestroyItem implements IClientIncomingPacket client.sendPacket(sm); } - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 4fbde86e9d..322fefc438 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -311,12 +311,10 @@ public class RequestEnchantItem implements IClientIncomingPacket client.sendPacket(sm); } - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot()); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot())) { iu.addModifiedItem(itm); } - player.sendInventoryUpdate(iu); player.broadcastUserInfo(); } diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java index 730bd1b8f7..2bc2964039 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.clan.Clan.RankPrivs; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.PledgePowerGradeList; @@ -47,8 +46,7 @@ public class RequestPledgePowerGradeList implements IClientIncomingPacket final Clan clan = player.getClan(); if (clan != null) { - final RankPrivs[] privs = clan.getAllRankPrivs(); - player.sendPacket(new PledgePowerGradeList(privs)); + player.sendPacket(new PledgePowerGradeList(clan.getAllRankPrivs())); } } } \ No newline at end of file diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java index d04d35f338..1416c43ce0 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java @@ -115,8 +115,7 @@ public class RequestRefine extends AbstractRefinePacket final InventoryUpdate iu = new InventoryUpdate(); if (targetItem.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot()); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java index 240322a5da..a420f830b1 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java @@ -92,8 +92,7 @@ public class RequestRefineCancel implements IClientIncomingPacket final InventoryUpdate iu = new InventoryUpdate(); if (targetItem.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot()); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index f1cc81e68a..629cb64bc7 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.Arrays; +import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.PlayerCondOverride; @@ -99,27 +99,28 @@ public class RequestUnEquipItem implements IClientIncomingPacket return; } - final ItemInstance[] unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); player.broadcastUserInfo(); // This can be 0 if the user pressed the right mouse button twice very fast. - if (unequipped.length > 0) + if (!unequipped.isEmpty()) { SystemMessage sm = null; - if (unequipped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED); - sm.addInt(unequipped[0].getEnchantLevel()); + sm.addInt(unequippedItem.getEnchantLevel()); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); } - sm.addItemName(unequipped[0]); + sm.addItemName(unequippedItem); client.sendPacket(sm); final InventoryUpdate iu = new InventoryUpdate(); - iu.addItems(Arrays.asList(unequipped)); + iu.addItems(unequipped); player.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java index c3f5f4b0fa..7e27d26e1c 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java @@ -69,7 +69,7 @@ public abstract class AbstractInventoryUpdate extends AbstractItemPacket _items.put(item.getObjectId(), new ItemInfo(item, 3)); } - public void addItems(List items) + public void addItems(Collection items) { for (ItemInstance item : items) { diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 0ad644359c..d765e50064 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -48,7 +48,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket private final String _loginName; private final int _sessionId; private int _activeId; - private final CharSelectInfoPackage[] _characterPackages; + private final List _characterPackages; private static final int[] PAPERDOLL_ORDER = new int[] { @@ -148,7 +148,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket _activeId = activeId; } - public CharSelectInfoPackage[] getCharInfo() + public List getCharInfo() { return _characterPackages; } @@ -158,7 +158,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket { OutgoingPackets.CHARACTER_SELECTION_INFO.writeId(packet); - final int size = _characterPackages.length; + final int size = _characterPackages.size(); packet.writeD(size); // Created character count packet.writeD(Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT); // Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) ) @@ -197,9 +197,9 @@ public class CharSelectionInfo implements IClientOutgoingPacket { for (int i = 0; i < size; i++) { - if (lastAccess < _characterPackages[i].getLastAccess()) + if (lastAccess < _characterPackages.get(i).getLastAccess()) { - lastAccess = _characterPackages[i].getLastAccess(); + lastAccess = _characterPackages.get(i).getLastAccess(); _activeId = i; } } @@ -207,7 +207,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket for (int i = 0; i < size; i++) { - final CharSelectInfoPackage charInfoPackage = _characterPackages[i]; + final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i); packet.writeS(charInfoPackage.getName()); // Character name packet.writeD(charInfoPackage.getObjectId()); // Character ID packet.writeS(_loginName); // Account name @@ -310,7 +310,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket return true; } - private static CharSelectInfoPackage[] loadCharacterSelectInfo(String loginName) + private static List loadCharacterSelectInfo(String loginName) { CharSelectInfoPackage charInfopackage; final List characterList = new LinkedList<>(); @@ -336,13 +336,13 @@ public class CharSelectionInfo implements IClientOutgoingPacket } } } - return characterList.toArray(new CharSelectInfoPackage[characterList.size()]); } catch (Exception e) { LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } - return new CharSelectInfoPackage[0]; + + return characterList; } private static void loadCharacterSubclassInfo(CharSelectInfoPackage charInfopackage, int objectId, int activeClassId) diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java index 20d42578b2..4ae5ffe316 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.clan.Clan; @@ -39,12 +41,12 @@ public class ExPledgeRecruitInfo implements IClientOutgoingPacket { OutgoingPackets.EX_PLEDGE_RECRUIT_INFO.writeId(packet); - final SubPledge[] subPledges = _clan.getAllSubPledges(); + final Collection subPledges = _clan.getAllSubPledges(); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); packet.writeD(_clan.getLevel()); packet.writeD(_clan.getMembersCount()); - packet.writeD(subPledges.length); + packet.writeD(subPledges.size()); for (SubPledge subPledge : subPledges) { packet.writeD(subPledge.getId()); diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java index cb2e18edb9..fce9f86d25 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java @@ -16,15 +16,17 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan.RankPrivs; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PledgePowerGradeList implements IClientOutgoingPacket { - private final RankPrivs[] _privs; + private final Collection _privs; - public PledgePowerGradeList(RankPrivs[] privs) + public PledgePowerGradeList(Collection privs) { _privs = privs; } @@ -33,8 +35,7 @@ public class PledgePowerGradeList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_POWER_GRADE_LIST.writeId(packet); - - packet.writeD(_privs.length); + packet.writeD(_privs.size()); for (RankPrivs temp : _privs) { packet.writeD(temp.getRank()); diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java index eab507b686..591ab8690a 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java @@ -16,6 +16,9 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; +import java.util.List; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.skills.Skill; @@ -26,8 +29,8 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class PledgeSkillList implements IClientOutgoingPacket { - private final Skill[] _skills; - private final SubPledgeSkill[] _subSkills; + private final Collection _skills; + private final List _subSkills; public static class SubPledgeSkill { @@ -53,9 +56,8 @@ public class PledgeSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SKILL_LIST.writeId(packet); - - packet.writeD(_skills.length); - packet.writeD(_subSkills.length); // Squad skill length + packet.writeD(_skills.size()); + packet.writeD(_subSkills.size()); // Squad skill length for (Skill sk : _skills) { packet.writeD(sk.getDisplayId()); diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java index 88a45c71fc..38f43a3fe0 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java @@ -48,7 +48,7 @@ public class PrivateStoreListSell extends AbstractItemPacket packet.writeD(_seller.getSellList().isPackaged() ? 1 : 0); packet.writeQ(_player.getAdena()); packet.writeD(0x00); - packet.writeD(_seller.getSellList().getItems().length); + packet.writeD(_seller.getSellList().getItems().size()); for (TradeItem item : _seller.getSellList().getItems()) { writeItem(packet, item); diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index e180102d7f..56dee576c2 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -30,7 +30,7 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket private final int _objId; private final long _playerAdena; private final Collection _itemList; - private final TradeItem[] _buyList; + private final Collection _buyList; public PrivateStoreManageListBuy(int sendType, PlayerInstance player) { diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java index dfdbbb1524..724eb8998b 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java @@ -30,7 +30,7 @@ public class PrivateStoreManageListSell extends AbstractItemPacket private final long _playerAdena; private final boolean _packageSale; private final Collection _itemList; - private final TradeItem[] _sellList; + private final Collection _sellList; public PrivateStoreManageListSell(int sendType, PlayerInstance player, boolean isPackageSale) { diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java index 751f688f0d..ca0e8e8296 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -23,7 +25,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ShortCutInit implements IClientOutgoingPacket { - private Shortcut[] _shortCuts; + private Collection _shortCuts; public ShortCutInit(PlayerInstance player) { @@ -40,7 +42,7 @@ public class ShortCutInit implements IClientOutgoingPacket { OutgoingPackets.SHORT_CUT_INIT.writeId(packet); - packet.writeD(_shortCuts.length); + packet.writeD(_shortCuts.size()); for (Shortcut sc : _shortCuts) { packet.writeD(sc.getType().ordinal()); diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java index 7e32d855fe..bfb530ca83 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets.attributechange; +import java.util.List; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -26,13 +28,13 @@ import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket; */ public class ExChangeAttributeItemList extends AbstractItemPacket { - private final ItemInfo[] _itemsList; + private final List _itemsList; private final int _itemId; - public ExChangeAttributeItemList(int itemId, ItemInfo[] itemsList) + public ExChangeAttributeItemList(int itemId, List itemList) { _itemId = itemId; - _itemsList = itemsList; + _itemsList = itemList; } @Override @@ -40,7 +42,7 @@ public class ExChangeAttributeItemList extends AbstractItemPacket { OutgoingPackets.EX_CHANGE_ATTRIBUTE_ITEM_LIST.writeId(packet); packet.writeD(_itemId); - packet.writeD(_itemsList.length); + packet.writeD(_itemsList.size()); for (ItemInfo item : _itemsList) { writeItem(packet, item); diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java index 771c0e3848..a34595ca73 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java @@ -594,9 +594,8 @@ public class AdminMobGroup implements IAdminCommandHandler private void showGroupList(PlayerInstance activeChar) { - final MobGroup[] mobGroupList = MobGroupTable.getInstance().getGroups(); BuilderUtil.sendSysMessage(activeChar, "======= ======="); - for (MobGroup mobGroup : mobGroupList) + for (MobGroup mobGroup : MobGroupTable.getInstance().getGroups()) { activeChar.sendMessage(mobGroup.getGroupId() + ": " + mobGroup.getActiveMobCount() + " alive out of " + mobGroup.getMaxMobCount() + " of NPC ID " + mobGroup.getTemplate().getId() + " (" + mobGroup.getStatus() + ")"); } diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java index 11c52819e5..636639079c 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java @@ -99,9 +99,8 @@ public class ItemAuctionLink implements IBypassHandler } else if ("cancel".equalsIgnoreCase(cmd)) { - final ItemAuction[] auctions = au.getAuctionsByBidder(player.getObjectId()); boolean returned = false; - for (ItemAuction auction : auctions) + for (ItemAuction auction : au.getAuctionsByBidder(player.getObjectId())) { if (auction.cancelBid(player)) { diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index 4e27548f49..7ebe1e6ff5 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -16,6 +16,8 @@ */ package handlers.effecthandlers; +import java.util.List; + import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -84,7 +86,7 @@ public class ConvertItem extends AbstractEffect final int enchantLevel = wpn.getEnchantLevel(); final AttributeHolder elementals = wpn.getAttributes() == null ? null : wpn.getAttackAttribute(); - final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (ItemInstance unequippedItem : unequiped) { @@ -92,10 +94,11 @@ public class ConvertItem extends AbstractEffect } player.sendInventoryUpdate(iu); - if (unequiped.length <= 0) + if (unequiped.isEmpty()) { return; } + byte count = 0; for (ItemInstance unequippedItem : unequiped) { @@ -120,7 +123,7 @@ public class ConvertItem extends AbstractEffect player.sendPacket(sm); } - if (count == unequiped.length) + if (count == unequiped.size()) { return; } diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index 90d1568c8c..9c56971dcb 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -16,6 +16,7 @@ */ package handlers.effecthandlers; +import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -67,11 +68,11 @@ public class Disarmor extends AbstractEffect } final PlayerInstance player = effected.getActingPlayer(); - final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); - if (unequiped.length > 0) + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); + if (!unequipped.isEmpty()) { final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : unequipped) { iu.addModifiedItem(itm); } @@ -79,20 +80,21 @@ public class Disarmor extends AbstractEffect player.broadcastUserInfo(); SystemMessage sm = null; - if (unequiped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED); - sm.addInt(unequiped[0].getEnchantLevel()); - sm.addItemName(unequiped[0]); + sm.addInt(unequippedItem.getEnchantLevel()); + sm.addItemName(unequippedItem); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); - sm.addItemName(unequiped[0]); + sm.addItemName(unequippedItem); } player.sendPacket(sm); effected.getInventory().blockItemSlot(_slot); - _unequippedItems.put(effected.getObjectId(), unequiped[0].getObjectId()); + _unequippedItems.put(effected.getObjectId(), unequippedItem.getObjectId()); } } diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 19954820bc..119a616831 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -82,7 +82,7 @@ public class ChangeAttributeCrystal implements IItemHandler return false; } - player.sendPacket(new ExChangeAttributeItemList(item.getId(), itemList.toArray(new ItemInfo[itemList.size()]))); + player.sendPacket(new ExChangeAttributeItemList(item.getId(), itemList)); return true; } } \ No newline at end of file diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/MacroList.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/MacroList.java index 2411db329d..ead95f13ea 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/MacroList.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/MacroList.java @@ -90,8 +90,7 @@ public class MacroList implements IRestorable deleteMacroFromDb(removed); } - final Shortcut[] allShortCuts = _owner.getAllShortCuts(); - for (Shortcut sc : allShortCuts) + for (Shortcut sc : _owner.getAllShortCuts()) { if ((sc.getId() == id) && (sc.getType() == ShortcutType.MACRO)) { diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/MobGroupTable.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/MobGroupTable.java index 244fd07964..e61d726687 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/MobGroupTable.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/MobGroupTable.java @@ -16,6 +16,7 @@ */ package org.l2jmobius.gameserver.model; +import java.util.Collection; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -67,9 +68,9 @@ public class MobGroupTable return null; } - public MobGroup[] getGroups() + public Collection getGroups() { - return _groupMap.values().toArray(new MobGroup[_groupMap.size()]); + return _groupMap.values(); } public boolean removeGroup(int groupKey) diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ShortCuts.java index 8cf01b5f4f..da9c30d0d0 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; +import java.util.Collection; import java.util.Map; import java.util.TreeMap; import java.util.logging.Level; @@ -46,9 +47,9 @@ public class ShortCuts implements IRestorable _owner = owner; } - public Shortcut[] getAllShortCuts() + public Collection getAllShortCuts() { - return _shortCuts.values().toArray(new Shortcut[_shortCuts.values().size()]); + return _shortCuts.values(); } public Shortcut getShortCut(int slot, int page) diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/TradeList.java index 73ac57f840..114e3f112b 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/TradeList.java @@ -107,9 +107,9 @@ public class TradeList /** * @return all items from TradeList */ - public TradeItem[] getItems() + public Collection getItems() { - return _items.toArray(new TradeItem[_items.size()]); + return _items; } /** @@ -863,7 +863,7 @@ public class TradeList final InventoryUpdate playerIU = new InventoryUpdate(); long totalPrice = 0; - final TradeItem[] sellerItems = _items.toArray(new TradeItem[0]); + final TradeItem[] sellerItems = _items.toArray(new TradeItem[_items.size()]); for (ItemRequest item : requestedItems) { // searching item in tradelist using itemId diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index a3f1297382..88a93ab26f 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -1582,9 +1582,9 @@ public class PlayerInstance extends Playable } /** - * @return a table containing all ShortCut of the PlayerInstance. + * @return a collection containing all ShortCut of the PlayerInstance. */ - public Shortcut[] getAllShortCuts() + public Collection getAllShortCuts() { return _shortCuts.getAllShortCuts(); } @@ -2164,7 +2164,7 @@ public class PlayerInstance extends Playable } // Equip or unEquip - ItemInstance[] items = null; + List items = null; final boolean isEquiped = item.isEquipped(); final int oldInvLimit = getInventoryLimit(); SystemMessage sm = null; @@ -2232,7 +2232,7 @@ public class PlayerInstance extends Playable broadcastUserInfo(); final InventoryUpdate iu = new InventoryUpdate(); - iu.addItems(Arrays.asList(items)); + iu.addItems(items); sendInventoryUpdate(iu); if (abortAttack) @@ -5872,9 +5872,9 @@ public class PlayerInstance extends Playable return false; } - final ItemInstance[] unequiped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : unequipped) { iu.addModifiedItem(itm); } @@ -5884,19 +5884,20 @@ public class PlayerInstance extends Playable broadcastUserInfo(); // This can be 0 if the user pressed the right mousebutton twice very fast. - if (unequiped.length > 0) + if (!unequipped.isEmpty()) { final SystemMessage sm; - if (unequiped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED); - sm.addInt(unequiped[0].getEnchantLevel()); - sm.addItemName(unequiped[0]); + sm.addInt(unequippedItem.getEnchantLevel()); + sm.addItemName(unequippedItem); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); - sm.addItemName(unequiped[0]); + sm.addItemName(unequippedItem); } sendPacket(sm); } @@ -5912,9 +5913,9 @@ public class PlayerInstance extends Playable final ItemInstance sld = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (sld != null) { - final ItemInstance[] unequiped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : unequipped) { iu.addModifiedItem(itm); } @@ -5924,19 +5925,20 @@ public class PlayerInstance extends Playable broadcastUserInfo(); // this can be 0 if the user pressed the right mousebutton twice very fast - if (unequiped.length > 0) + if (!unequipped.isEmpty()) { SystemMessage sm = null; - if (unequiped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED); - sm.addInt(unequiped[0].getEnchantLevel()); - sm.addItemName(unequiped[0]); + sm.addInt(unequippedItem.getEnchantLevel()); + sm.addItemName(unequippedItem); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); - sm.addItemName(unequiped[0]); + sm.addItemName(unequippedItem); } sendPacket(sm); } diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/Clan.java index 9c70a2b61c..14935a25d9 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -1199,9 +1199,9 @@ public class Clan implements IIdentifiable, INamable /** * @return all the clan skills. */ - public Skill[] getAllSkills() + public Collection getAllSkills() { - return _skills.values().toArray(new Skill[_skills.values().size()]); + return _skills.values(); } /** @@ -1755,9 +1755,9 @@ public class Clan implements IIdentifiable, INamable * Used to retrieve all subPledges * @return */ - public SubPledge[] getAllSubPledges() + public Collection getAllSubPledges() { - return _subPledges.values().toArray(new SubPledge[_subPledges.values().size()]); + return _subPledges.values(); } public SubPledge createSubPledge(int pledgeType) @@ -1909,9 +1909,9 @@ public class Clan implements IIdentifiable, INamable /** * @return all RankPrivs. */ - public RankPrivs[] getAllRankPrivs() + public Collection getAllRankPrivs() { - return _privs.values().toArray(new RankPrivs[_privs.values().size()]); + return _privs.values(); } public int getLeaderSubPledge(int leaderId) @@ -2572,7 +2572,7 @@ public class Clan implements IIdentifiable, INamable return false; } - public SubPledgeSkill[] getAllSubSkills() + public List getAllSubSkills() { final List list = new LinkedList<>(); for (Skill skill : _subPledgeSkills.values()) @@ -2586,7 +2586,7 @@ public class Clan implements IIdentifiable, INamable list.add(new SubPledgeSkill(subunit.getId(), skill.getId(), skill.getLevel())); } } - return list.toArray(new SubPledgeSkill[list.size()]); + return list; } public void setNewLeaderId(int objectId, boolean storeInDb) diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 8f195b1ba9..8c3f3b5bfd 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -2963,9 +2963,8 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime // Destroy the quantity of items wanted if (item.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(item.getItem().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInBodySlotAndRecord(item.getItem().getBodyPart())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index f14581064a..0161150ecb 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -347,7 +347,7 @@ public class ItemAuctionInstance return _auctions.get(auctionId); } - public ItemAuction[] getAuctionsByBidder(int bidderObjId) + public ArrayList getAuctionsByBidder(int bidderObjId) { final Collection auctions = getAuctions(); final ArrayList stack = new ArrayList<>(auctions.size()); @@ -362,7 +362,7 @@ public class ItemAuctionInstance } } } - return stack.toArray(new ItemAuction[stack.size()]); + return stack; } public Collection getAuctions() diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 042309385d..147d7386ae 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -25,8 +25,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; import java.util.function.Predicate; import java.util.logging.Level; @@ -173,7 +171,7 @@ public abstract class Inventory extends ItemContainer private static final class ChangeRecorder implements PaperdollListener { private final Inventory _inventory; - private final Set _changed = ConcurrentHashMap.newKeySet(); + private final List _changed = new ArrayList<>(1); /** * Constructor of the ChangeRecorder @@ -213,9 +211,9 @@ public abstract class Inventory extends ItemContainer * Returns alterations in inventory * @return ItemInstance[] : array of altered items */ - public ItemInstance[] getChangedItems() + public List getChangedItems() { - return _changed.toArray(new ItemInstance[_changed.size()]); + return _changed; } } @@ -1734,12 +1732,11 @@ public abstract class Inventory extends ItemContainer * Unequips item in body slot and returns alterations.
* If you dont need return value use {@link Inventory#unEquipItemInBodySlot(long)} instead * @param slot : int designating the slot of the paperdoll - * @return ItemInstance[] : list of changes + * @return List : List of changes */ - public ItemInstance[] unEquipItemInBodySlotAndRecord(long slot) + public List unEquipItemInBodySlotAndRecord(long slot) { final ChangeRecorder recorder = newRecorder(); - try { unEquipItemInBodySlot(slot); @@ -1765,12 +1762,11 @@ public abstract class Inventory extends ItemContainer * Unequips item in slot and returns alterations
* If you dont need return value use {@link Inventory#unEquipItemInSlot(int)} instead * @param slot : int designating the slot - * @return ItemInstance[] : list of items altered + * @return List : List of items altered */ - public ItemInstance[] unEquipItemInSlotAndRecord(int slot) + public List unEquipItemInSlotAndRecord(int slot) { final ChangeRecorder recorder = newRecorder(); - try { unEquipItemInSlot(slot); @@ -1911,12 +1907,11 @@ public abstract class Inventory extends ItemContainer * Equips item and returns list of alterations
* If you don't need return value use {@link Inventory#equipItem(ItemInstance)} instead * @param item : ItemInstance corresponding to the item - * @return ItemInstance[] : list of alterations + * @return List : List of alterations */ - public ItemInstance[] equipItemAndRecord(ItemInstance item) + public List equipItemAndRecord(ItemInstance item) { final ChangeRecorder recorder = newRecorder(); - try { equipItem(item); diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java index 8943842d96..e83c19f0fc 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java @@ -1437,9 +1437,8 @@ public class ItemInstance extends WorldObject // unequip if (isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance item : unequiped) + for (ItemInstance item : player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot())) { iu.addModifiedItem(item); } @@ -1873,9 +1872,8 @@ public class ItemInstance extends WorldObject { if (isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance item : unequiped) + for (ItemInstance item : player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot())) { iu.addModifiedItem(item); } diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/GameClient.java index 99c66513d8..d42e5bf53a 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/GameClient.java @@ -21,6 +21,7 @@ import java.net.InetSocketAddress; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; +import java.util.List; import java.util.concurrent.locks.ReentrantLock; import java.util.logging.Level; import java.util.logging.Logger; @@ -78,7 +79,7 @@ public class GameClient extends ChannelInboundHandler private PlayerInstance _player; private SecondaryPasswordAuth _secondaryAuth; private ClientHardwareInfoHolder _hardwareInfo; - private CharSelectInfoPackage[] _charSlotMapping = null; + private List _charSlotMapping = null; private volatile boolean _isDetached = false; private boolean _isAuthedGG; private boolean _protocolOk; @@ -568,21 +569,18 @@ public class GameClient extends ChannelInboundHandler return player; } - /** - * @param chars - */ - public void setCharSelection(CharSelectInfoPackage[] chars) + public void setCharSelection(List characters) { - _charSlotMapping = chars; + _charSlotMapping = characters; } public CharSelectInfoPackage getCharSelection(int charslot) { - if ((_charSlotMapping == null) || (charslot < 0) || (charslot >= _charSlotMapping.length)) + if ((_charSlotMapping == null) || (charslot < 0) || (charslot >= _charSlotMapping.size())) { return null; } - return _charSlotMapping[charslot]; + return _charSlotMapping.get(charslot); } public SecondaryPasswordAuth getSecondaryAuth() diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 927ec4e407..f77b83cc31 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -204,9 +204,8 @@ public class RequestCrystallizeItem implements IClientIncomingPacket SystemMessage sm; if (itemToRemove.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance item : unequiped) + for (ItemInstance item : player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot())) { iu.addModifiedItem(item); } diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 0f8f2ab22f..3541ad4b56 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -193,9 +193,8 @@ public class RequestDestroyItem implements IClientIncomingPacket client.sendPacket(sm); } - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot()); final InventoryUpdate iu = new InventoryUpdate(); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 4fbde86e9d..322fefc438 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -311,12 +311,10 @@ public class RequestEnchantItem implements IClientIncomingPacket client.sendPacket(sm); } - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot()); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot())) { iu.addModifiedItem(itm); } - player.sendInventoryUpdate(iu); player.broadcastUserInfo(); } diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java index 730bd1b8f7..2bc2964039 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.clan.Clan.RankPrivs; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.PledgePowerGradeList; @@ -47,8 +46,7 @@ public class RequestPledgePowerGradeList implements IClientIncomingPacket final Clan clan = player.getClan(); if (clan != null) { - final RankPrivs[] privs = clan.getAllRankPrivs(); - player.sendPacket(new PledgePowerGradeList(privs)); + player.sendPacket(new PledgePowerGradeList(clan.getAllRankPrivs())); } } } \ No newline at end of file diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java index d04d35f338..1416c43ce0 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java @@ -115,8 +115,7 @@ public class RequestRefine extends AbstractRefinePacket final InventoryUpdate iu = new InventoryUpdate(); if (targetItem.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot()); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java index 240322a5da..a420f830b1 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java @@ -92,8 +92,7 @@ public class RequestRefineCancel implements IClientIncomingPacket final InventoryUpdate iu = new InventoryUpdate(); if (targetItem.isEquipped()) { - final ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot()); - for (ItemInstance itm : unequiped) + for (ItemInstance itm : player.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot())) { iu.addModifiedItem(itm); } diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index f1cc81e68a..629cb64bc7 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.Arrays; +import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.PlayerCondOverride; @@ -99,27 +99,28 @@ public class RequestUnEquipItem implements IClientIncomingPacket return; } - final ItemInstance[] unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot); player.broadcastUserInfo(); // This can be 0 if the user pressed the right mouse button twice very fast. - if (unequipped.length > 0) + if (!unequipped.isEmpty()) { SystemMessage sm = null; - if (unequipped[0].getEnchantLevel() > 0) + final ItemInstance unequippedItem = unequipped.get(0); + if (unequippedItem.getEnchantLevel() > 0) { sm = new SystemMessage(SystemMessageId.S1_S2_HAS_BEEN_UNEQUIPPED); - sm.addInt(unequipped[0].getEnchantLevel()); + sm.addInt(unequippedItem.getEnchantLevel()); } else { sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); } - sm.addItemName(unequipped[0]); + sm.addItemName(unequippedItem); client.sendPacket(sm); final InventoryUpdate iu = new InventoryUpdate(); - iu.addItems(Arrays.asList(unequipped)); + iu.addItems(unequipped); player.sendInventoryUpdate(iu); } } diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java index c3f5f4b0fa..7e27d26e1c 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java @@ -69,7 +69,7 @@ public abstract class AbstractInventoryUpdate extends AbstractItemPacket _items.put(item.getObjectId(), new ItemInfo(item, 3)); } - public void addItems(List items) + public void addItems(Collection items) { for (ItemInstance item : items) { diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 0ad644359c..d765e50064 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -48,7 +48,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket private final String _loginName; private final int _sessionId; private int _activeId; - private final CharSelectInfoPackage[] _characterPackages; + private final List _characterPackages; private static final int[] PAPERDOLL_ORDER = new int[] { @@ -148,7 +148,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket _activeId = activeId; } - public CharSelectInfoPackage[] getCharInfo() + public List getCharInfo() { return _characterPackages; } @@ -158,7 +158,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket { OutgoingPackets.CHARACTER_SELECTION_INFO.writeId(packet); - final int size = _characterPackages.length; + final int size = _characterPackages.size(); packet.writeD(size); // Created character count packet.writeD(Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT); // Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) ) @@ -197,9 +197,9 @@ public class CharSelectionInfo implements IClientOutgoingPacket { for (int i = 0; i < size; i++) { - if (lastAccess < _characterPackages[i].getLastAccess()) + if (lastAccess < _characterPackages.get(i).getLastAccess()) { - lastAccess = _characterPackages[i].getLastAccess(); + lastAccess = _characterPackages.get(i).getLastAccess(); _activeId = i; } } @@ -207,7 +207,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket for (int i = 0; i < size; i++) { - final CharSelectInfoPackage charInfoPackage = _characterPackages[i]; + final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i); packet.writeS(charInfoPackage.getName()); // Character name packet.writeD(charInfoPackage.getObjectId()); // Character ID packet.writeS(_loginName); // Account name @@ -310,7 +310,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket return true; } - private static CharSelectInfoPackage[] loadCharacterSelectInfo(String loginName) + private static List loadCharacterSelectInfo(String loginName) { CharSelectInfoPackage charInfopackage; final List characterList = new LinkedList<>(); @@ -336,13 +336,13 @@ public class CharSelectionInfo implements IClientOutgoingPacket } } } - return characterList.toArray(new CharSelectInfoPackage[characterList.size()]); } catch (Exception e) { LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } - return new CharSelectInfoPackage[0]; + + return characterList; } private static void loadCharacterSubclassInfo(CharSelectInfoPackage charInfopackage, int objectId, int activeClassId) diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java index 20d42578b2..4ae5ffe316 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.clan.Clan; @@ -39,12 +41,12 @@ public class ExPledgeRecruitInfo implements IClientOutgoingPacket { OutgoingPackets.EX_PLEDGE_RECRUIT_INFO.writeId(packet); - final SubPledge[] subPledges = _clan.getAllSubPledges(); + final Collection subPledges = _clan.getAllSubPledges(); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); packet.writeD(_clan.getLevel()); packet.writeD(_clan.getMembersCount()); - packet.writeD(subPledges.length); + packet.writeD(subPledges.size()); for (SubPledge subPledge : subPledges) { packet.writeD(subPledge.getId()); diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java index cb2e18edb9..fce9f86d25 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java @@ -16,15 +16,17 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan.RankPrivs; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PledgePowerGradeList implements IClientOutgoingPacket { - private final RankPrivs[] _privs; + private final Collection _privs; - public PledgePowerGradeList(RankPrivs[] privs) + public PledgePowerGradeList(Collection privs) { _privs = privs; } @@ -33,8 +35,7 @@ public class PledgePowerGradeList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_POWER_GRADE_LIST.writeId(packet); - - packet.writeD(_privs.length); + packet.writeD(_privs.size()); for (RankPrivs temp : _privs) { packet.writeD(temp.getRank()); diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java index eab507b686..591ab8690a 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java @@ -16,6 +16,9 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; +import java.util.List; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.skills.Skill; @@ -26,8 +29,8 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class PledgeSkillList implements IClientOutgoingPacket { - private final Skill[] _skills; - private final SubPledgeSkill[] _subSkills; + private final Collection _skills; + private final List _subSkills; public static class SubPledgeSkill { @@ -53,9 +56,8 @@ public class PledgeSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SKILL_LIST.writeId(packet); - - packet.writeD(_skills.length); - packet.writeD(_subSkills.length); // Squad skill length + packet.writeD(_skills.size()); + packet.writeD(_subSkills.size()); // Squad skill length for (Skill sk : _skills) { packet.writeD(sk.getDisplayId()); diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java index 88a45c71fc..38f43a3fe0 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java @@ -48,7 +48,7 @@ public class PrivateStoreListSell extends AbstractItemPacket packet.writeD(_seller.getSellList().isPackaged() ? 1 : 0); packet.writeQ(_player.getAdena()); packet.writeD(0x00); - packet.writeD(_seller.getSellList().getItems().length); + packet.writeD(_seller.getSellList().getItems().size()); for (TradeItem item : _seller.getSellList().getItems()) { writeItem(packet, item); diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index e180102d7f..56dee576c2 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -30,7 +30,7 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket private final int _objId; private final long _playerAdena; private final Collection _itemList; - private final TradeItem[] _buyList; + private final Collection _buyList; public PrivateStoreManageListBuy(int sendType, PlayerInstance player) { diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java index dfdbbb1524..724eb8998b 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java @@ -30,7 +30,7 @@ public class PrivateStoreManageListSell extends AbstractItemPacket private final long _playerAdena; private final boolean _packageSale; private final Collection _itemList; - private final TradeItem[] _sellList; + private final Collection _sellList; public PrivateStoreManageListSell(int sendType, PlayerInstance player, boolean isPackageSale) { diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java index 751f688f0d..ca0e8e8296 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -23,7 +25,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ShortCutInit implements IClientOutgoingPacket { - private Shortcut[] _shortCuts; + private Collection _shortCuts; public ShortCutInit(PlayerInstance player) { @@ -40,7 +42,7 @@ public class ShortCutInit implements IClientOutgoingPacket { OutgoingPackets.SHORT_CUT_INIT.writeId(packet); - packet.writeD(_shortCuts.length); + packet.writeD(_shortCuts.size()); for (Shortcut sc : _shortCuts) { packet.writeD(sc.getType().ordinal()); diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java index 7e32d855fe..bfb530ca83 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeItemList.java @@ -16,6 +16,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets.attributechange; +import java.util.List; + import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -26,13 +28,13 @@ import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket; */ public class ExChangeAttributeItemList extends AbstractItemPacket { - private final ItemInfo[] _itemsList; + private final List _itemsList; private final int _itemId; - public ExChangeAttributeItemList(int itemId, ItemInfo[] itemsList) + public ExChangeAttributeItemList(int itemId, List itemList) { _itemId = itemId; - _itemsList = itemsList; + _itemsList = itemList; } @Override @@ -40,7 +42,7 @@ public class ExChangeAttributeItemList extends AbstractItemPacket { OutgoingPackets.EX_CHANGE_ATTRIBUTE_ITEM_LIST.writeId(packet); packet.writeD(_itemId); - packet.writeD(_itemsList.length); + packet.writeD(_itemsList.size()); for (ItemInfo item : _itemsList) { writeItem(packet, item); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Baium.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Baium.java index 62e8bd3131..885743f647 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Baium.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Baium.java @@ -475,14 +475,14 @@ public class Baium extends Quest return null; } - final Object[] characters = result.toArray(); final QuestTimer timer = getQuestTimer("clean_player", npc, null); if (timer != null) { timer.cancel(); } startQuestTimer("clean_player", 20000, npc, null); - return (Creature) characters[Rnd.get(characters.length)]; + + return result.get(Rnd.get(result.size())); } public synchronized void callSkillAI(NpcInstance npc) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Valakas.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Valakas.java index d063b1bf70..a6aec93720 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Valakas.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Valakas.java @@ -966,8 +966,7 @@ public class Valakas extends Quest } if (!result.isEmpty()) { - final Object[] characters = result.toArray(); - return (Creature) characters[Rnd.get(characters.length)]; + return result.get(Rnd.get(result.size())); } return null; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/Monastery.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/Monastery.java index cc883593e1..5d13fa0eaa 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/Monastery.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/Monastery.java @@ -118,38 +118,34 @@ public class Monastery extends Quest result.add((Playable) obj); } } - if (!result.isEmpty()) + for (Object obj : result) { - final Object[] characters = result.toArray(); - for (Object obj : characters) + final Playable target = (Playable) (obj instanceof PlayerInstance ? obj : ((Summon) obj).getOwner()); + if ((target.getActiveWeaponInstance() == null) || ((target instanceof PlayerInstance) && ((PlayerInstance) target).isSilentMoving()) || ((target instanceof Summon) && ((Summon) target).getOwner().isSilentMoving())) { - final Playable target = (Playable) (obj instanceof PlayerInstance ? obj : ((Summon) obj).getOwner()); - if ((target.getActiveWeaponInstance() == null) || ((target instanceof PlayerInstance) && ((PlayerInstance) target).isSilentMoving()) || ((target instanceof Summon) && ((Summon) target).getOwner().isSilentMoving())) + continue; + } + + if ((target.getActiveWeaponInstance() != null) && !npc.isInCombat() && (npc.getTarget() == null)) + { + npc.setTarget(target); + npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), TEXT[0])); + switch (npc.getNpcId()) { - continue; - } - - if ((target.getActiveWeaponInstance() != null) && !npc.isInCombat() && (npc.getTarget() == null)) - { - npc.setTarget(target); - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.GENERAL, npc.getName(), TEXT[0])); - switch (npc.getNpcId()) + case 22124: + case 22126: + case 22127: { - case 22124: - case 22126: - case 22127: - { - final Skill skill = SkillTable.getInstance().getSkill(4589, 8); - npc.doCast(skill); - break; - } - default: - { - npc.setRunning(true); - ((Attackable) npc).addDamageHate(target, 0, 999); - npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); - break; - } + final Skill skill = SkillTable.getInstance().getSkill(4589, 8); + npc.doCast(skill); + break; + } + default: + { + npc.setRunning(true); + ((Attackable) npc).addDamageHate(target, 0, 999); + npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); + break; } } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/RecipeController.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/RecipeController.java index 320346bc0c..a407adcdf3 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/RecipeController.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/RecipeController.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Map; @@ -93,9 +92,7 @@ public class RecipeController return; } - final List dwarfRecipes = Arrays.asList(manufacturer.getDwarvenRecipeBook()); - final List commonRecipes = Arrays.asList(manufacturer.getCommonRecipeBook()); - if (!dwarfRecipes.contains(recipeList) && !commonRecipes.contains(recipeList)) + if (!manufacturer.getDwarvenRecipeBook().contains(recipeList) && !manufacturer.getCommonRecipeBook().contains(recipeList)) { Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " sent a false recipe id.", Config.DEFAULT_PUNISH); return; @@ -131,9 +128,7 @@ public class RecipeController return; } - final List dwarfRecipes = Arrays.asList(player.getDwarvenRecipeBook()); - final List commonRecipes = Arrays.asList(player.getCommonRecipeBook()); - if (!dwarfRecipes.contains(recipeList) && !commonRecipes.contains(recipeList)) + if (!player.getDwarvenRecipeBook().contains(recipeList) && !player.getCommonRecipeBook().contains(recipeList)) { Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " sent a false recipe id.", Config.DEFAULT_PUNISH); return; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/communitybbs/Manager/ClanBBSManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/communitybbs/Manager/ClanBBSManager.java index fa6ee9bf4d..46a7703c66 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/communitybbs/Manager/ClanBBSManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/communitybbs/Manager/ClanBBSManager.java @@ -276,8 +276,8 @@ public class ClanBBSManager extends BaseBBSManager StringUtil.append(sb, "