From f99a7c866715ee6ab39f3569637b6c20de1ef574 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 20 Jan 2022 07:01:48 +0000 Subject: [PATCH] Better WorldObject toString method usage. --- .../ai/areas/FantasyIsle/TalentShow.java | 2 +- .../CastleChamberlain/CastleChamberlain.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 4 +-- .../ai/others/ManorManager/ManorManager.java | 2 +- .../features/SkillTransfer/SkillTransfer.java | 2 +- .../scripts/handlers/bypasshandlers/Link.java | 4 +-- .../handlers/communityboard/ClanBoard.java | 4 +-- .../communityboard/FavoriteBoard.java | 6 ++-- .../handlers/communityboard/HomeBoard.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../scripts/instances/AbstractInstance.java | 2 +- .../gameserver/data/xml/MultisellData.java | 2 +- .../handler/AdminCommandHandler.java | 2 +- .../l2jmobius/gameserver/model/TradeList.java | 2 +- .../gameserver/model/actor/Player.java | 14 +++++----- .../model/actor/instance/Teleporter.java | 8 +++--- .../gameserver/model/quest/Quest.java | 4 +-- .../model/teleporter/TeleportHolder.java | 6 ++-- .../clientpackets/RequestAcquireSkill.java | 28 +++++++++---------- .../clientpackets/RequestActionUse.java | 2 +- .../clientpackets/RequestBypassToServer.java | 4 +-- .../RequestCancelPostAttachment.java | 8 +++--- .../clientpackets/RequestCrystallizeItem.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestEnchantItem.java | 8 +++--- .../RequestExEnchantItemAttribute.java | 4 +-- .../clientpackets/RequestGetBossRecord.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../clientpackets/RequestLinkHtml.java | 6 ++-- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPostAttachment.java | 10 +++---- .../clientpackets/RequestPrivateStoreBuy.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRecipeShopListSet.java | 2 +- .../RequestRecipeShopMessageSet.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../clientpackets/SetPrivateStoreMsgBuy.java | 2 +- .../clientpackets/SetPrivateStoreMsgSell.java | 2 +- .../SetPrivateStoreWholeMsg.java | 2 +- .../ability/RequestAcquireAbilityList.java | 8 +++--- .../RequestChangeAttributeItem.java | 2 +- .../commission/RequestCommissionRegister.java | 12 ++++---- .../primeshop/RequestBRBuyProduct.java | 4 +-- .../primeshop/RequestBRPresentBuyProduct.java | 4 +-- .../serverpackets/SellListProcure.java | 2 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../ai/areas/FantasyIsle/TalentShow.java | 2 +- .../CastleChamberlain/CastleChamberlain.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 4 +-- .../ai/others/ManorManager/ManorManager.java | 2 +- .../features/SkillTransfer/SkillTransfer.java | 2 +- .../scripts/handlers/bypasshandlers/Link.java | 4 +-- .../handlers/communityboard/ClanBoard.java | 4 +-- .../communityboard/FavoriteBoard.java | 6 ++-- .../handlers/communityboard/HomeBoard.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../scripts/instances/AbstractInstance.java | 2 +- .../gameserver/data/xml/MultisellData.java | 2 +- .../handler/AdminCommandHandler.java | 2 +- .../l2jmobius/gameserver/model/TradeList.java | 2 +- .../gameserver/model/actor/Player.java | 14 +++++----- .../model/actor/instance/Teleporter.java | 8 +++--- .../gameserver/model/quest/Quest.java | 4 +-- .../model/teleporter/TeleportHolder.java | 6 ++-- .../clientpackets/RequestAcquireSkill.java | 28 +++++++++---------- .../clientpackets/RequestActionUse.java | 2 +- .../clientpackets/RequestBypassToServer.java | 4 +-- .../RequestCancelPostAttachment.java | 8 +++--- .../clientpackets/RequestCrystallizeItem.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestEnchantItem.java | 8 +++--- .../RequestExEnchantItemAttribute.java | 4 +-- .../clientpackets/RequestGetBossRecord.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../clientpackets/RequestLinkHtml.java | 6 ++-- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPostAttachment.java | 10 +++---- .../clientpackets/RequestPrivateStoreBuy.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRecipeShopListSet.java | 2 +- .../RequestRecipeShopMessageSet.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../clientpackets/SetPrivateStoreMsgBuy.java | 2 +- .../clientpackets/SetPrivateStoreMsgSell.java | 2 +- .../SetPrivateStoreWholeMsg.java | 2 +- .../ability/RequestAcquireAbilityList.java | 8 +++--- .../RequestChangeAttributeItem.java | 2 +- .../commission/RequestCommissionRegister.java | 12 ++++---- .../primeshop/RequestBRBuyProduct.java | 4 +-- .../primeshop/RequestBRPresentBuyProduct.java | 4 +-- .../serverpackets/SellListProcure.java | 2 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../ai/areas/FantasyIsle/TalentShow.java | 2 +- .../CastleChamberlain/CastleChamberlain.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 4 +-- .../ai/others/ManorManager/ManorManager.java | 2 +- .../features/SkillTransfer/SkillTransfer.java | 2 +- .../scripts/handlers/bypasshandlers/Link.java | 4 +-- .../handlers/communityboard/ClanBoard.java | 4 +-- .../communityboard/FavoriteBoard.java | 6 ++-- .../handlers/communityboard/HomeBoard.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../scripts/instances/AbstractInstance.java | 2 +- .../gameserver/data/xml/MultisellData.java | 2 +- .../handler/AdminCommandHandler.java | 2 +- .../l2jmobius/gameserver/model/TradeList.java | 2 +- .../gameserver/model/actor/Player.java | 14 +++++----- .../model/actor/instance/Teleporter.java | 8 +++--- .../gameserver/model/quest/Quest.java | 4 +-- .../model/teleporter/TeleportHolder.java | 6 ++-- .../clientpackets/RequestAcquireSkill.java | 28 +++++++++---------- .../clientpackets/RequestActionUse.java | 2 +- .../clientpackets/RequestBypassToServer.java | 4 +-- .../RequestCancelPostAttachment.java | 8 +++--- .../clientpackets/RequestCrystallizeItem.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestEnchantItem.java | 8 +++--- .../RequestExEnchantItemAttribute.java | 4 +-- .../clientpackets/RequestGetBossRecord.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../clientpackets/RequestLinkHtml.java | 6 ++-- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPostAttachment.java | 10 +++---- .../clientpackets/RequestPrivateStoreBuy.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRecipeShopListSet.java | 2 +- .../RequestRecipeShopMessageSet.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../clientpackets/SetPrivateStoreMsgBuy.java | 2 +- .../clientpackets/SetPrivateStoreMsgSell.java | 2 +- .../SetPrivateStoreWholeMsg.java | 2 +- .../ability/RequestAcquireAbilityList.java | 8 +++--- .../RequestChangeAttributeItem.java | 2 +- .../commission/RequestCommissionRegister.java | 12 ++++---- .../primeshop/RequestBRBuyProduct.java | 4 +-- .../primeshop/RequestBRPresentBuyProduct.java | 4 +-- .../serverpackets/SellListProcure.java | 2 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../ai/areas/FantasyIsle/TalentShow.java | 2 +- .../CastleChamberlain/CastleChamberlain.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 4 +-- .../ai/others/ManorManager/ManorManager.java | 2 +- .../features/SkillTransfer/SkillTransfer.java | 2 +- .../scripts/handlers/bypasshandlers/Link.java | 4 +-- .../handlers/communityboard/ClanBoard.java | 4 +-- .../communityboard/FavoriteBoard.java | 6 ++-- .../handlers/communityboard/HomeBoard.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../scripts/instances/AbstractInstance.java | 2 +- .../gameserver/data/xml/MultisellData.java | 2 +- .../handler/AdminCommandHandler.java | 2 +- .../l2jmobius/gameserver/model/TradeList.java | 2 +- .../gameserver/model/actor/Player.java | 14 +++++----- .../model/actor/instance/Teleporter.java | 8 +++--- .../gameserver/model/quest/Quest.java | 4 +-- .../model/teleporter/TeleportHolder.java | 6 ++-- .../clientpackets/RequestAcquireSkill.java | 28 +++++++++---------- .../clientpackets/RequestActionUse.java | 2 +- .../clientpackets/RequestBypassToServer.java | 4 +-- .../RequestCancelPostAttachment.java | 8 +++--- .../clientpackets/RequestCrystallizeItem.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestEnchantItem.java | 8 +++--- .../RequestExEnchantItemAttribute.java | 4 +-- .../clientpackets/RequestGetBossRecord.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../clientpackets/RequestLinkHtml.java | 6 ++-- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPostAttachment.java | 10 +++---- .../clientpackets/RequestPrivateStoreBuy.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRecipeShopListSet.java | 4 +-- .../RequestRecipeShopMessageSet.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../clientpackets/SetPrivateStoreMsgBuy.java | 2 +- .../clientpackets/SetPrivateStoreMsgSell.java | 2 +- .../SetPrivateStoreWholeMsg.java | 2 +- .../ability/RequestAcquireAbilityList.java | 8 +++--- .../RequestChangeAttributeItem.java | 2 +- .../commission/RequestCommissionRegister.java | 12 ++++---- .../primeshop/RequestBRBuyProduct.java | 4 +-- .../primeshop/RequestBRPresentBuyProduct.java | 4 +-- .../serverpackets/SellListProcure.java | 2 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../ai/areas/FantasyIsle/TalentShow.java | 2 +- .../CastleChamberlain/CastleChamberlain.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 4 +-- .../ai/others/ManorManager/ManorManager.java | 2 +- .../features/SkillTransfer/SkillTransfer.java | 2 +- .../scripts/handlers/bypasshandlers/Link.java | 4 +-- .../handlers/communityboard/ClanBoard.java | 4 +-- .../communityboard/FavoriteBoard.java | 6 ++-- .../handlers/communityboard/HomeBoard.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../scripts/instances/AbstractInstance.java | 2 +- .../gameserver/data/xml/MultisellData.java | 2 +- .../handler/AdminCommandHandler.java | 2 +- .../l2jmobius/gameserver/model/TradeList.java | 2 +- .../gameserver/model/actor/Player.java | 14 +++++----- .../model/actor/instance/Teleporter.java | 8 +++--- .../gameserver/model/quest/Quest.java | 4 +-- .../model/teleporter/TeleportHolder.java | 6 ++-- .../clientpackets/RequestAcquireSkill.java | 28 +++++++++---------- .../clientpackets/RequestActionUse.java | 2 +- .../clientpackets/RequestBypassToServer.java | 4 +-- .../RequestCancelPostAttachment.java | 8 +++--- .../clientpackets/RequestCrystallizeItem.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestEnchantItem.java | 8 +++--- .../RequestExEnchantItemAttribute.java | 4 +-- .../clientpackets/RequestGetBossRecord.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../clientpackets/RequestLinkHtml.java | 6 ++-- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPostAttachment.java | 10 +++---- .../clientpackets/RequestPrivateStoreBuy.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRecipeShopListSet.java | 4 +-- .../RequestRecipeShopMessageSet.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../clientpackets/SetPrivateStoreMsgBuy.java | 2 +- .../clientpackets/SetPrivateStoreMsgSell.java | 2 +- .../SetPrivateStoreWholeMsg.java | 2 +- .../ability/RequestAcquireAbilityList.java | 8 +++--- .../RequestChangeAttributeItem.java | 2 +- .../commission/RequestCommissionRegister.java | 12 ++++---- .../primeshop/RequestBRBuyProduct.java | 4 +-- .../primeshop/RequestBRPresentBuyProduct.java | 4 +-- .../serverpackets/SellListProcure.java | 2 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../ai/areas/FantasyIsle/TalentShow.java | 2 +- .../CastleChamberlain/CastleChamberlain.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 4 +-- .../ai/others/ManorManager/ManorManager.java | 2 +- .../features/SkillTransfer/SkillTransfer.java | 2 +- .../scripts/handlers/bypasshandlers/Link.java | 4 +-- .../handlers/communityboard/ClanBoard.java | 4 +-- .../communityboard/FavoriteBoard.java | 6 ++-- .../handlers/communityboard/HomeBoard.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../scripts/instances/AbstractInstance.java | 2 +- .../gameserver/data/xml/MultisellData.java | 2 +- .../handler/AdminCommandHandler.java | 2 +- .../l2jmobius/gameserver/model/TradeList.java | 2 +- .../gameserver/model/actor/Player.java | 14 +++++----- .../model/actor/instance/Teleporter.java | 8 +++--- .../gameserver/model/quest/Quest.java | 4 +-- .../model/teleporter/TeleportHolder.java | 6 ++-- .../clientpackets/RequestAcquireSkill.java | 28 +++++++++---------- .../clientpackets/RequestActionUse.java | 2 +- .../clientpackets/RequestBypassToServer.java | 4 +-- .../RequestCancelPostAttachment.java | 8 +++--- .../clientpackets/RequestCrystallizeItem.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestEnchantItem.java | 8 +++--- .../RequestExEnchantItemAttribute.java | 4 +-- .../clientpackets/RequestGetBossRecord.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../clientpackets/RequestLinkHtml.java | 6 ++-- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPostAttachment.java | 10 +++---- .../clientpackets/RequestPrivateStoreBuy.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRecipeShopListSet.java | 4 +-- .../RequestRecipeShopMessageSet.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../clientpackets/SetPrivateStoreMsgBuy.java | 2 +- .../clientpackets/SetPrivateStoreMsgSell.java | 2 +- .../SetPrivateStoreWholeMsg.java | 2 +- .../ability/RequestAcquireAbilityList.java | 8 +++--- .../RequestChangeAttributeItem.java | 2 +- .../commission/RequestCommissionRegister.java | 12 ++++---- .../primeshop/RequestBRBuyProduct.java | 4 +-- .../primeshop/RequestBRPresentBuyProduct.java | 4 +-- .../serverpackets/SellListProcure.java | 2 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../ai/areas/FantasyIsle/TalentShow.java | 2 +- .../CastleChamberlain/CastleChamberlain.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 4 +-- .../ai/others/ManorManager/ManorManager.java | 2 +- .../features/SkillTransfer/SkillTransfer.java | 2 +- .../scripts/handlers/bypasshandlers/Link.java | 4 +-- .../handlers/communityboard/ClanBoard.java | 4 +-- .../communityboard/FavoriteBoard.java | 6 ++-- .../handlers/communityboard/HomeBoard.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../scripts/instances/AbstractInstance.java | 2 +- .../gameserver/data/xml/MultisellData.java | 2 +- .../handler/AdminCommandHandler.java | 2 +- .../l2jmobius/gameserver/model/TradeList.java | 2 +- .../gameserver/model/actor/Player.java | 14 +++++----- .../model/actor/instance/Teleporter.java | 8 +++--- .../gameserver/model/quest/Quest.java | 4 +-- .../model/teleporter/TeleportHolder.java | 6 ++-- .../clientpackets/RequestAcquireSkill.java | 28 +++++++++---------- .../clientpackets/RequestActionUse.java | 2 +- .../clientpackets/RequestBypassToServer.java | 4 +-- .../RequestCancelPostAttachment.java | 8 +++--- .../clientpackets/RequestCrystallizeItem.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestEnchantItem.java | 8 +++--- .../RequestExEnchantItemAttribute.java | 4 +-- .../clientpackets/RequestGetBossRecord.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../clientpackets/RequestLinkHtml.java | 6 ++-- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPostAttachment.java | 10 +++---- .../clientpackets/RequestPrivateStoreBuy.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRecipeShopListSet.java | 4 +-- .../RequestRecipeShopMessageSet.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../clientpackets/SetPrivateStoreMsgBuy.java | 2 +- .../clientpackets/SetPrivateStoreMsgSell.java | 2 +- .../SetPrivateStoreWholeMsg.java | 2 +- .../ability/RequestAcquireAbilityList.java | 8 +++--- .../RequestChangeAttributeItem.java | 2 +- .../commission/RequestCommissionRegister.java | 12 ++++---- .../primeshop/RequestBRBuyProduct.java | 4 +-- .../primeshop/RequestBRPresentBuyProduct.java | 4 +-- .../serverpackets/SellListProcure.java | 2 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../ai/areas/FantasyIsle/TalentShow.java | 2 +- .../CastleChamberlain/CastleChamberlain.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 4 +-- .../ai/others/ManorManager/ManorManager.java | 2 +- .../features/SkillTransfer/SkillTransfer.java | 2 +- .../scripts/handlers/bypasshandlers/Link.java | 4 +-- .../handlers/communityboard/ClanBoard.java | 4 +-- .../communityboard/FavoriteBoard.java | 6 ++-- .../handlers/communityboard/HomeBoard.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../scripts/instances/AbstractInstance.java | 2 +- .../gameserver/data/xml/MultisellData.java | 2 +- .../handler/AdminCommandHandler.java | 2 +- .../l2jmobius/gameserver/model/TradeList.java | 2 +- .../gameserver/model/actor/Player.java | 14 +++++----- .../model/actor/instance/Teleporter.java | 8 +++--- .../gameserver/model/quest/Quest.java | 4 +-- .../model/teleporter/TeleportHolder.java | 6 ++-- .../clientpackets/RequestAcquireSkill.java | 28 +++++++++---------- .../clientpackets/RequestActionUse.java | 2 +- .../clientpackets/RequestBypassToServer.java | 4 +-- .../RequestCancelPostAttachment.java | 8 +++--- .../clientpackets/RequestCrystallizeItem.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestEnchantItem.java | 8 +++--- .../RequestExEnchantItemAttribute.java | 4 +-- .../clientpackets/RequestGetBossRecord.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../clientpackets/RequestLinkHtml.java | 6 ++-- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPostAttachment.java | 10 +++---- .../clientpackets/RequestPrivateStoreBuy.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRecipeShopListSet.java | 4 +-- .../RequestRecipeShopMessageSet.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../clientpackets/SetPrivateStoreMsgBuy.java | 2 +- .../clientpackets/SetPrivateStoreMsgSell.java | 2 +- .../SetPrivateStoreWholeMsg.java | 2 +- .../ability/RequestAcquireAbilityList.java | 8 +++--- .../RequestChangeAttributeItem.java | 2 +- .../commission/RequestCommissionRegister.java | 12 ++++---- .../primeshop/RequestBRBuyProduct.java | 4 +-- .../primeshop/RequestBRPresentBuyProduct.java | 4 +-- .../serverpackets/SellListProcure.java | 2 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../ai/areas/FantasyIsle/TalentShow.java | 2 +- .../CastleChamberlain/CastleChamberlain.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 4 +-- .../ai/others/ManorManager/ManorManager.java | 2 +- .../scripts/handlers/bypasshandlers/Link.java | 4 +-- .../handlers/communityboard/ClanBoard.java | 4 +-- .../communityboard/FavoriteBoard.java | 6 ++-- .../handlers/communityboard/HomeBoard.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../scripts/instances/AbstractInstance.java | 2 +- .../gameserver/data/xml/MultisellData.java | 2 +- .../handler/AdminCommandHandler.java | 2 +- .../l2jmobius/gameserver/model/TradeList.java | 2 +- .../gameserver/model/actor/Player.java | 14 +++++----- .../model/actor/instance/Teleporter.java | 8 +++--- .../gameserver/model/quest/Quest.java | 4 +-- .../model/teleporter/TeleportHolder.java | 6 ++-- .../clientpackets/RequestAcquireSkill.java | 28 +++++++++---------- .../clientpackets/RequestActionUse.java | 2 +- .../clientpackets/RequestBypassToServer.java | 4 +-- .../RequestCancelPostAttachment.java | 8 +++--- .../clientpackets/RequestCrystallizeItem.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestEnchantItem.java | 8 +++--- .../RequestExEnchantItemAttribute.java | 4 +-- .../clientpackets/RequestGetBossRecord.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../clientpackets/RequestLinkHtml.java | 6 ++-- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPostAttachment.java | 10 +++---- .../clientpackets/RequestPrivateStoreBuy.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRecipeShopListSet.java | 4 +-- .../RequestRecipeShopMessageSet.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../clientpackets/SetPrivateStoreMsgBuy.java | 2 +- .../clientpackets/SetPrivateStoreMsgSell.java | 2 +- .../SetPrivateStoreWholeMsg.java | 2 +- .../ability/RequestAcquireAbilityList.java | 8 +++--- .../RequestChangeAttributeItem.java | 2 +- .../commission/RequestCommissionRegister.java | 12 ++++---- .../primeshop/RequestBRBuyProduct.java | 4 +-- .../primeshop/RequestBRPresentBuyProduct.java | 4 +-- .../serverpackets/SellListProcure.java | 2 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../ai/areas/FantasyIsle/TalentShow.java | 2 +- .../CastleChamberlain/CastleChamberlain.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 4 +-- .../ai/others/ManorManager/ManorManager.java | 2 +- .../scripts/handlers/bypasshandlers/Link.java | 4 +-- .../handlers/communityboard/ClanBoard.java | 4 +-- .../communityboard/FavoriteBoard.java | 6 ++-- .../handlers/communityboard/HomeBoard.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../scripts/instances/AbstractInstance.java | 2 +- .../gameserver/data/xml/MultisellData.java | 2 +- .../handler/AdminCommandHandler.java | 2 +- .../l2jmobius/gameserver/model/TradeList.java | 2 +- .../gameserver/model/actor/Player.java | 14 +++++----- .../model/actor/instance/Teleporter.java | 8 +++--- .../gameserver/model/quest/Quest.java | 4 +-- .../model/teleporter/TeleportHolder.java | 6 ++-- .../clientpackets/RequestAcquireSkill.java | 28 +++++++++---------- .../clientpackets/RequestActionUse.java | 2 +- .../clientpackets/RequestBypassToServer.java | 4 +-- .../RequestCancelPostAttachment.java | 8 +++--- .../clientpackets/RequestCrystallizeItem.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestEnchantItem.java | 8 +++--- .../RequestExEnchantItemAttribute.java | 4 +-- .../clientpackets/RequestGetBossRecord.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../clientpackets/RequestLinkHtml.java | 6 ++-- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPostAttachment.java | 10 +++---- .../clientpackets/RequestPrivateStoreBuy.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRecipeShopListSet.java | 4 +-- .../RequestRecipeShopMessageSet.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../clientpackets/SetPrivateStoreMsgBuy.java | 2 +- .../clientpackets/SetPrivateStoreMsgSell.java | 2 +- .../SetPrivateStoreWholeMsg.java | 2 +- .../ability/RequestAcquireAbilityList.java | 8 +++--- .../RequestChangeAttributeItem.java | 2 +- .../commission/RequestCommissionRegister.java | 12 ++++---- .../primeshop/RequestBRBuyProduct.java | 4 +-- .../primeshop/RequestBRPresentBuyProduct.java | 4 +-- .../serverpackets/SellListProcure.java | 2 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../ai/areas/FantasyIsle/TalentShow.java | 2 +- .../CastleChamberlain/CastleChamberlain.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 4 +-- .../ai/others/ManorManager/ManorManager.java | 2 +- .../scripts/handlers/bypasshandlers/Link.java | 4 +-- .../handlers/communityboard/ClanBoard.java | 4 +-- .../communityboard/FavoriteBoard.java | 6 ++-- .../handlers/communityboard/HomeBoard.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../scripts/instances/AbstractInstance.java | 2 +- .../gameserver/data/xml/MultisellData.java | 2 +- .../handler/AdminCommandHandler.java | 2 +- .../l2jmobius/gameserver/model/TradeList.java | 2 +- .../gameserver/model/actor/Player.java | 14 +++++----- .../model/actor/instance/Teleporter.java | 8 +++--- .../gameserver/model/quest/Quest.java | 4 +-- .../model/teleporter/TeleportHolder.java | 6 ++-- .../clientpackets/RequestAcquireSkill.java | 28 +++++++++---------- .../clientpackets/RequestActionUse.java | 2 +- .../clientpackets/RequestBypassToServer.java | 4 +-- .../RequestCancelPostAttachment.java | 8 +++--- .../clientpackets/RequestCrystallizeItem.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestEnchantItem.java | 8 +++--- .../RequestExEnchantItemAttribute.java | 4 +-- .../clientpackets/RequestGetBossRecord.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../clientpackets/RequestLinkHtml.java | 6 ++-- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPostAttachment.java | 10 +++---- .../clientpackets/RequestPrivateStoreBuy.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRecipeShopListSet.java | 4 +-- .../RequestRecipeShopMessageSet.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../clientpackets/SetPrivateStoreMsgBuy.java | 2 +- .../clientpackets/SetPrivateStoreMsgSell.java | 2 +- .../SetPrivateStoreWholeMsg.java | 2 +- .../ability/RequestAcquireAbilityList.java | 8 +++--- .../RequestChangeAttributeItem.java | 2 +- .../commission/RequestCommissionRegister.java | 12 ++++---- .../primeshop/RequestBRBuyProduct.java | 4 +-- .../primeshop/RequestBRPresentBuyProduct.java | 4 +-- .../serverpackets/SellListProcure.java | 2 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../Manager/FavoriteBBSManager.java | 6 ++-- .../handler/itemhandlers/SoulCrystals.java | 2 +- .../DimensionalRiftManager.java | 2 +- .../FourSepulchersManager.java | 6 ++-- .../instancemanager/RebirthManager.java | 2 +- .../l2jmobius/gameserver/model/TradeList.java | 4 +-- .../gameserver/model/WorldObject.java | 6 ++++ .../gameserver/model/actor/Attackable.java | 2 +- .../gameserver/model/actor/Creature.java | 6 ---- .../l2jmobius/gameserver/model/actor/Npc.java | 2 +- .../gameserver/model/actor/Player.java | 22 ++++++--------- .../gameserver/model/actor/Summon.java | 6 ++++ .../model/actor/instance/CastleWarehouse.java | 2 +- .../actor/instance/ClanHallSiegeInfo.java | 4 +-- .../gameserver/model/actor/instance/Door.java | 2 +- .../model/actor/instance/VillageMaster.java | 6 ++-- .../gameserver/model/item/instance/Item.java | 2 +- .../model/olympiad/OlympiadGame.java | 14 +++++----- .../network/clientpackets/EnterWorld.java | 2 +- .../clientpackets/MoveBackwardToLocation.java | 2 +- .../clientpackets/RequestAquireSkill.java | 12 ++++---- .../clientpackets/RequestEnchantItem.java | 4 +-- .../clientpackets/RequestExEnchantSkill.java | 4 +-- .../clientpackets/RequestGetItemFromPet.java | 2 +- .../clientpackets/RequestGiveItemToPet.java | 2 +- .../clientpackets/RequestPrivateStoreBuy.java | 10 +++---- .../RequestPrivateStoreManageBuy.java | 4 +-- .../RequestPrivateStoreManageSell.java | 4 +-- .../RequestPrivateStoreSell.java | 4 +-- .../network/clientpackets/RequestRestart.java | 2 +- .../network/clientpackets/Say2.java | 2 +- .../SetPrivateStoreListSell.java | 2 +- .../network/clientpackets/TradeDone.java | 2 +- .../network/clientpackets/UseItem.java | 8 +++--- .../serverpackets/SellListProcure.java | 2 +- .../Manager/FavoriteBBSManager.java | 6 ++-- .../gameserver/data/xml/AugmentationData.java | 2 +- .../handler/itemhandlers/SoulCrystals.java | 2 +- .../DimensionalRiftManager.java | 2 +- .../FourSepulchersManager.java | 6 ++-- .../instancemanager/RebirthManager.java | 2 +- .../l2jmobius/gameserver/model/TradeList.java | 4 +-- .../gameserver/model/WorldObject.java | 6 ++++ .../gameserver/model/actor/Attackable.java | 2 +- .../gameserver/model/actor/Creature.java | 6 ---- .../l2jmobius/gameserver/model/actor/Npc.java | 2 +- .../gameserver/model/actor/Player.java | 22 ++++++--------- .../gameserver/model/actor/Summon.java | 6 ++++ .../model/actor/instance/CastleWarehouse.java | 2 +- .../actor/instance/ClanHallSiegeInfo.java | 4 +-- .../gameserver/model/actor/instance/Door.java | 2 +- .../model/actor/instance/VillageMaster.java | 6 ++-- .../gameserver/model/item/instance/Item.java | 2 +- .../model/olympiad/OlympiadGame.java | 14 +++++----- .../network/clientpackets/EnterWorld.java | 2 +- .../clientpackets/MoveBackwardToLocation.java | 2 +- .../clientpackets/RequestAquireSkill.java | 12 ++++---- .../clientpackets/RequestEnchantItem.java | 4 +-- .../clientpackets/RequestExEnchantSkill.java | 4 +-- .../clientpackets/RequestGetItemFromPet.java | 2 +- .../clientpackets/RequestGiveItemToPet.java | 2 +- .../clientpackets/RequestPrivateStoreBuy.java | 10 +++---- .../RequestPrivateStoreManageBuy.java | 4 +-- .../RequestPrivateStoreManageSell.java | 4 +-- .../RequestPrivateStoreSell.java | 4 +-- .../network/clientpackets/RequestRestart.java | 2 +- .../network/clientpackets/Say2.java | 2 +- .../SetPrivateStoreListSell.java | 2 +- .../network/clientpackets/TradeDone.java | 2 +- .../network/clientpackets/UseItem.java | 8 +++--- .../serverpackets/SellListProcure.java | 2 +- .../ai/areas/FantasyIsle/TalentShow.java | 2 +- .../ai/others/AvantGarde/AvantGarde.java | 6 ++-- .../CastleChamberlain/CastleChamberlain.java | 2 +- .../ai/others/ManorManager/ManorManager.java | 2 +- .../custom/Validators/SubClassSkills.java | 6 ++-- .../features/SkillTransfer/SkillTransfer.java | 2 +- .../scripts/handlers/bypasshandlers/Link.java | 4 +-- .../handlers/communityboard/ClanBoard.java | 4 +-- .../communityboard/FavoriteBoard.java | 6 ++-- .../handlers/communityboard/HomeBoard.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../TerritoryWarSuperClass.java | 4 +-- .../gameserver/data/xml/MultisellData.java | 2 +- .../handler/AdminCommandHandler.java | 2 +- .../DimensionalRiftManager.java | 2 +- .../FourSepulchersManager.java | 2 +- .../l2jmobius/gameserver/model/TradeList.java | 2 +- .../gameserver/model/actor/Player.java | 10 +++---- .../gameserver/model/quest/Quest.java | 4 +-- .../clientpackets/MoveBackwardToLocation.java | 2 +- .../clientpackets/RequestAcquireSkill.java | 22 +++++++-------- .../clientpackets/RequestActionUse.java | 2 +- .../clientpackets/RequestBypassToServer.java | 4 +-- .../RequestCancelPostAttachment.java | 8 +++--- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestEnchantItem.java | 8 +++--- .../RequestExEnchantItemAttribute.java | 6 ++-- .../RequestExEnchantSkillRouteChange.java | 2 +- .../clientpackets/RequestHennaEquip.java | 4 +-- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../clientpackets/RequestLinkHtml.java | 6 ++-- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPostAttachment.java | 10 +++---- .../clientpackets/RequestPrivateStoreBuy.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRecipeShopListSet.java | 4 +-- .../RequestRecipeShopMessageSet.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../network/clientpackets/RequestRestart.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../clientpackets/SetPrivateStoreMsgBuy.java | 2 +- .../clientpackets/SetPrivateStoreMsgSell.java | 2 +- .../SetPrivateStoreWholeMsg.java | 2 +- .../serverpackets/SellListProcure.java | 2 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../ai/areas/FantasyIsle/TalentShow.java | 2 +- .../ai/others/AvantGarde/AvantGarde.java | 6 ++-- .../CastleChamberlain/CastleChamberlain.java | 2 +- .../ai/others/ManorManager/ManorManager.java | 2 +- .../custom/Validators/SubClassSkills.java | 6 ++-- .../features/SkillTransfer/SkillTransfer.java | 2 +- .../scripts/handlers/bypasshandlers/Link.java | 4 +-- .../handlers/communityboard/ClanBoard.java | 4 +-- .../communityboard/FavoriteBoard.java | 6 ++-- .../handlers/communityboard/HomeBoard.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../TerritoryWarSuperClass.java | 4 +-- .../gameserver/data/xml/MultisellData.java | 2 +- .../handler/AdminCommandHandler.java | 2 +- .../DimensionalRiftManager.java | 2 +- .../FourSepulchersManager.java | 2 +- .../l2jmobius/gameserver/model/TradeList.java | 2 +- .../gameserver/model/actor/Player.java | 10 +++---- .../gameserver/model/quest/Quest.java | 4 +-- .../clientpackets/MoveBackwardToLocation.java | 2 +- .../clientpackets/RequestAcquireSkill.java | 22 +++++++-------- .../clientpackets/RequestActionUse.java | 2 +- .../clientpackets/RequestBypassToServer.java | 4 +-- .../RequestCancelPostAttachment.java | 8 +++--- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestEnchantItem.java | 8 +++--- .../RequestExEnchantItemAttribute.java | 6 ++-- .../RequestExEnchantSkillRouteChange.java | 2 +- .../clientpackets/RequestHennaEquip.java | 4 +-- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../clientpackets/RequestLinkHtml.java | 6 ++-- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPostAttachment.java | 10 +++---- .../clientpackets/RequestPrivateStoreBuy.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRecipeShopListSet.java | 4 +-- .../RequestRecipeShopMessageSet.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../network/clientpackets/RequestRestart.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../clientpackets/SetPrivateStoreMsgBuy.java | 2 +- .../clientpackets/SetPrivateStoreMsgSell.java | 2 +- .../SetPrivateStoreWholeMsg.java | 2 +- .../serverpackets/SellListProcure.java | 2 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../CastleChamberlain/CastleChamberlain.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 4 +-- .../scripts/handlers/bypasshandlers/Link.java | 4 +-- .../handlers/communityboard/ClanBoard.java | 4 +-- .../communityboard/FavoriteBoard.java | 6 ++-- .../handlers/communityboard/HomeBoard.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../scripts/instances/AbstractInstance.java | 2 +- .../gameserver/data/xml/MultisellData.java | 2 +- .../handler/AdminCommandHandler.java | 2 +- .../l2jmobius/gameserver/model/TradeList.java | 2 +- .../gameserver/model/actor/Player.java | 14 +++++----- .../model/actor/instance/Teleporter.java | 8 +++--- .../model/actor/instance/VillageMaster.java | 6 ++-- .../gameserver/model/quest/Quest.java | 4 +-- .../model/teleporter/TeleportHolder.java | 6 ++-- .../clientpackets/RequestAcquireSkill.java | 16 +++++------ .../clientpackets/RequestActionUse.java | 2 +- .../clientpackets/RequestBypassToServer.java | 4 +-- .../RequestCancelPostAttachment.java | 8 +++--- .../clientpackets/RequestCrystallizeItem.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestEnchantItem.java | 8 +++--- .../RequestExEnchantItemAttribute.java | 4 +-- .../clientpackets/RequestGetBossRecord.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../clientpackets/RequestLinkHtml.java | 6 ++-- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPostAttachment.java | 10 +++---- .../clientpackets/RequestPrivateStoreBuy.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRecipeShopListSet.java | 4 +-- .../RequestRecipeShopMessageSet.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../clientpackets/SetPrivateStoreMsgBuy.java | 2 +- .../clientpackets/SetPrivateStoreMsgSell.java | 2 +- .../SetPrivateStoreWholeMsg.java | 2 +- .../RequestChangeAttributeItem.java | 2 +- .../commission/RequestCommissionRegister.java | 12 ++++---- .../primeshop/RequestBRBuyProduct.java | 4 +-- .../primeshop/RequestBRPresentBuyProduct.java | 4 +-- .../serverpackets/SellListProcure.java | 2 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../CastleChamberlain/CastleChamberlain.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 4 +-- .../scripts/handlers/bypasshandlers/Link.java | 4 +-- .../handlers/communityboard/ClanBoard.java | 4 +-- .../communityboard/FavoriteBoard.java | 6 ++-- .../handlers/communityboard/HomeBoard.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../scripts/instances/AbstractInstance.java | 2 +- .../gameserver/data/xml/MultisellData.java | 2 +- .../handler/AdminCommandHandler.java | 2 +- .../l2jmobius/gameserver/model/TradeList.java | 2 +- .../gameserver/model/actor/Player.java | 14 +++++----- .../model/actor/instance/Teleporter.java | 8 +++--- .../model/actor/instance/VillageMaster.java | 6 ++-- .../gameserver/model/quest/Quest.java | 4 +-- .../model/teleporter/TeleportHolder.java | 6 ++-- .../clientpackets/RequestAcquireSkill.java | 16 +++++------ .../clientpackets/RequestActionUse.java | 2 +- .../clientpackets/RequestBypassToServer.java | 4 +-- .../RequestCancelPostAttachment.java | 8 +++--- .../clientpackets/RequestCrystallizeItem.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestEnchantItem.java | 8 +++--- .../RequestExEnchantItemAttribute.java | 4 +-- .../clientpackets/RequestGetBossRecord.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../clientpackets/RequestLinkHtml.java | 6 ++-- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPostAttachment.java | 10 +++---- .../clientpackets/RequestPrivateStoreBuy.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRecipeShopListSet.java | 4 +-- .../RequestRecipeShopMessageSet.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../clientpackets/SetPrivateStoreMsgBuy.java | 2 +- .../clientpackets/SetPrivateStoreMsgSell.java | 2 +- .../SetPrivateStoreWholeMsg.java | 2 +- .../RequestChangeAttributeItem.java | 2 +- .../commission/RequestCommissionRegister.java | 12 ++++---- .../primeshop/RequestBRBuyProduct.java | 4 +-- .../primeshop/RequestBRPresentBuyProduct.java | 4 +-- .../serverpackets/SellListProcure.java | 2 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../CastleChamberlain/CastleChamberlain.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 4 +-- .../scripts/handlers/bypasshandlers/Link.java | 4 +-- .../handlers/communityboard/ClanBoard.java | 4 +-- .../communityboard/FavoriteBoard.java | 6 ++-- .../handlers/communityboard/HomeBoard.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../scripts/instances/AbstractInstance.java | 2 +- .../gameserver/data/xml/MultisellData.java | 2 +- .../handler/AdminCommandHandler.java | 2 +- .../l2jmobius/gameserver/model/TradeList.java | 2 +- .../gameserver/model/actor/Player.java | 14 +++++----- .../model/actor/instance/Teleporter.java | 8 +++--- .../model/actor/instance/VillageMaster.java | 6 ++-- .../gameserver/model/quest/Quest.java | 4 +-- .../model/teleporter/TeleportHolder.java | 6 ++-- .../clientpackets/RequestAcquireSkill.java | 16 +++++------ .../clientpackets/RequestActionUse.java | 2 +- .../clientpackets/RequestBypassToServer.java | 4 +-- .../RequestCancelPostAttachment.java | 8 +++--- .../clientpackets/RequestCrystallizeItem.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestEnchantItem.java | 8 +++--- .../RequestExEnchantItemAttribute.java | 4 +-- .../clientpackets/RequestGetBossRecord.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../clientpackets/RequestLinkHtml.java | 6 ++-- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPostAttachment.java | 10 +++---- .../clientpackets/RequestPrivateStoreBuy.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRecipeShopListSet.java | 4 +-- .../RequestRecipeShopMessageSet.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../clientpackets/SetPrivateStoreMsgBuy.java | 2 +- .../clientpackets/SetPrivateStoreMsgSell.java | 2 +- .../SetPrivateStoreWholeMsg.java | 2 +- .../RequestChangeAttributeItem.java | 2 +- .../commission/RequestCommissionRegister.java | 12 ++++---- .../primeshop/RequestBRBuyProduct.java | 4 +-- .../primeshop/RequestBRPresentBuyProduct.java | 4 +-- .../serverpackets/SellListProcure.java | 2 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../CastleChamberlain/CastleChamberlain.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 4 +-- .../scripts/handlers/bypasshandlers/Link.java | 4 +-- .../handlers/communityboard/ClanBoard.java | 4 +-- .../communityboard/FavoriteBoard.java | 6 ++-- .../handlers/communityboard/HomeBoard.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../scripts/instances/AbstractInstance.java | 2 +- .../gameserver/data/xml/MultisellData.java | 2 +- .../handler/AdminCommandHandler.java | 2 +- .../l2jmobius/gameserver/model/TradeList.java | 2 +- .../gameserver/model/actor/Player.java | 14 +++++----- .../model/actor/instance/Teleporter.java | 8 +++--- .../model/actor/instance/VillageMaster.java | 6 ++-- .../gameserver/model/quest/Quest.java | 4 +-- .../model/teleporter/TeleportHolder.java | 6 ++-- .../clientpackets/RequestAcquireSkill.java | 16 +++++------ .../clientpackets/RequestActionUse.java | 2 +- .../clientpackets/RequestBypassToServer.java | 4 +-- .../RequestCancelPostAttachment.java | 8 +++--- .../clientpackets/RequestCrystallizeItem.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestEnchantItem.java | 8 +++--- .../RequestExEnchantItemAttribute.java | 4 +-- .../clientpackets/RequestGetBossRecord.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../clientpackets/RequestLinkHtml.java | 6 ++-- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPostAttachment.java | 10 +++---- .../clientpackets/RequestPrivateStoreBuy.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRecipeShopListSet.java | 4 +-- .../RequestRecipeShopMessageSet.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../clientpackets/SetPrivateStoreMsgBuy.java | 2 +- .../clientpackets/SetPrivateStoreMsgSell.java | 2 +- .../SetPrivateStoreWholeMsg.java | 2 +- .../RequestChangeAttributeItem.java | 2 +- .../commission/RequestCommissionRegister.java | 12 ++++---- .../primeshop/RequestBRBuyProduct.java | 4 +-- .../primeshop/RequestBRPresentBuyProduct.java | 4 +-- .../serverpackets/SellListProcure.java | 2 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../CastleChamberlain/CastleChamberlain.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 4 +-- .../scripts/handlers/bypasshandlers/Link.java | 4 +-- .../handlers/communityboard/ClanBoard.java | 4 +-- .../communityboard/FavoriteBoard.java | 6 ++-- .../handlers/communityboard/HomeBoard.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../scripts/instances/AbstractInstance.java | 2 +- .../gameserver/data/xml/MultisellData.java | 2 +- .../handler/AdminCommandHandler.java | 2 +- .../l2jmobius/gameserver/model/TradeList.java | 2 +- .../gameserver/model/actor/Player.java | 14 +++++----- .../model/actor/instance/Teleporter.java | 8 +++--- .../model/actor/instance/VillageMaster.java | 6 ++-- .../gameserver/model/quest/Quest.java | 4 +-- .../model/teleporter/TeleportHolder.java | 6 ++-- .../clientpackets/RequestAcquireSkill.java | 16 +++++------ .../clientpackets/RequestActionUse.java | 2 +- .../clientpackets/RequestBypassToServer.java | 4 +-- .../RequestCancelPostAttachment.java | 8 +++--- .../clientpackets/RequestCrystallizeItem.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestEnchantItem.java | 8 +++--- .../RequestExEnchantItemAttribute.java | 4 +-- .../clientpackets/RequestGetBossRecord.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../clientpackets/RequestLinkHtml.java | 6 ++-- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPostAttachment.java | 10 +++---- .../clientpackets/RequestPrivateStoreBuy.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRecipeShopListSet.java | 4 +-- .../RequestRecipeShopMessageSet.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../clientpackets/SetPrivateStoreMsgBuy.java | 2 +- .../clientpackets/SetPrivateStoreMsgSell.java | 2 +- .../SetPrivateStoreWholeMsg.java | 2 +- .../RequestChangeAttributeItem.java | 2 +- .../commission/RequestCommissionRegister.java | 12 ++++---- .../primeshop/RequestBRBuyProduct.java | 4 +-- .../primeshop/RequestBRPresentBuyProduct.java | 4 +-- .../serverpackets/SellListProcure.java | 2 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../CastleChamberlain/CastleChamberlain.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 4 +-- .../scripts/handlers/bypasshandlers/Link.java | 4 +-- .../handlers/communityboard/ClanBoard.java | 4 +-- .../communityboard/FavoriteBoard.java | 6 ++-- .../handlers/communityboard/HomeBoard.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../scripts/instances/AbstractInstance.java | 2 +- .../gameserver/data/xml/MultisellData.java | 2 +- .../handler/AdminCommandHandler.java | 2 +- .../l2jmobius/gameserver/model/TradeList.java | 2 +- .../gameserver/model/actor/Player.java | 14 +++++----- .../model/actor/instance/Teleporter.java | 8 +++--- .../model/actor/instance/VillageMaster.java | 6 ++-- .../gameserver/model/quest/Quest.java | 4 +-- .../model/teleporter/TeleportHolder.java | 6 ++-- .../clientpackets/RequestAcquireSkill.java | 16 +++++------ .../clientpackets/RequestActionUse.java | 2 +- .../clientpackets/RequestBypassToServer.java | 4 +-- .../RequestCancelPostAttachment.java | 8 +++--- .../clientpackets/RequestCrystallizeItem.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestEnchantItem.java | 8 +++--- .../RequestExEnchantItemAttribute.java | 4 +-- .../clientpackets/RequestGetBossRecord.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../clientpackets/RequestLinkHtml.java | 6 ++-- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPostAttachment.java | 10 +++---- .../clientpackets/RequestPrivateStoreBuy.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRecipeShopListSet.java | 4 +-- .../RequestRecipeShopMessageSet.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../clientpackets/SetPrivateStoreMsgBuy.java | 2 +- .../clientpackets/SetPrivateStoreMsgSell.java | 2 +- .../SetPrivateStoreWholeMsg.java | 2 +- .../RequestChangeAttributeItem.java | 2 +- .../commission/RequestCommissionRegister.java | 12 ++++---- .../primeshop/RequestBRBuyProduct.java | 4 +-- .../primeshop/RequestBRPresentBuyProduct.java | 4 +-- .../serverpackets/SellListProcure.java | 2 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../CastleChamberlain/CastleChamberlain.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 4 +-- .../scripts/handlers/bypasshandlers/Link.java | 4 +-- .../handlers/communityboard/ClanBoard.java | 4 +-- .../communityboard/FavoriteBoard.java | 6 ++-- .../handlers/communityboard/HomeBoard.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../scripts/instances/AbstractInstance.java | 2 +- .../gameserver/data/xml/MultisellData.java | 2 +- .../handler/AdminCommandHandler.java | 2 +- .../l2jmobius/gameserver/model/TradeList.java | 2 +- .../gameserver/model/actor/Player.java | 14 +++++----- .../model/actor/instance/Teleporter.java | 8 +++--- .../model/actor/instance/VillageMaster.java | 6 ++-- .../gameserver/model/quest/Quest.java | 4 +-- .../model/teleporter/TeleportHolder.java | 6 ++-- .../clientpackets/RequestAcquireSkill.java | 16 +++++------ .../clientpackets/RequestActionUse.java | 2 +- .../clientpackets/RequestBypassToServer.java | 4 +-- .../RequestCancelPostAttachment.java | 8 +++--- .../clientpackets/RequestCrystallizeItem.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestEnchantItem.java | 8 +++--- .../RequestExEnchantItemAttribute.java | 4 +-- .../clientpackets/RequestGetBossRecord.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../clientpackets/RequestLinkHtml.java | 6 ++-- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPostAttachment.java | 10 +++---- .../clientpackets/RequestPrivateStoreBuy.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRecipeShopListSet.java | 4 +-- .../RequestRecipeShopMessageSet.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../clientpackets/SetPrivateStoreMsgBuy.java | 2 +- .../clientpackets/SetPrivateStoreMsgSell.java | 2 +- .../SetPrivateStoreWholeMsg.java | 2 +- .../RequestChangeAttributeItem.java | 2 +- .../commission/RequestCommissionRegister.java | 12 ++++---- .../primeshop/RequestBRBuyProduct.java | 4 +-- .../primeshop/RequestBRPresentBuyProduct.java | 4 +-- .../serverpackets/SellListProcure.java | 2 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../CastleChamberlain/CastleChamberlain.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 4 +-- .../scripts/handlers/bypasshandlers/Link.java | 4 +-- .../handlers/communityboard/ClanBoard.java | 4 +-- .../communityboard/FavoriteBoard.java | 6 ++-- .../handlers/communityboard/HomeBoard.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../scripts/instances/AbstractInstance.java | 2 +- .../gameserver/data/xml/MultisellData.java | 2 +- .../handler/AdminCommandHandler.java | 2 +- .../l2jmobius/gameserver/model/TradeList.java | 2 +- .../gameserver/model/actor/Player.java | 14 +++++----- .../model/actor/instance/Teleporter.java | 8 +++--- .../model/actor/instance/VillageMaster.java | 6 ++-- .../gameserver/model/quest/Quest.java | 4 +-- .../model/teleporter/TeleportHolder.java | 6 ++-- .../clientpackets/RequestAcquireSkill.java | 16 +++++------ .../clientpackets/RequestActionUse.java | 2 +- .../clientpackets/RequestBypassToServer.java | 4 +-- .../RequestCancelPostAttachment.java | 8 +++--- .../clientpackets/RequestCrystallizeItem.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestEnchantItem.java | 8 +++--- .../RequestExEnchantItemAttribute.java | 4 +-- .../clientpackets/RequestGetBossRecord.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../clientpackets/RequestLinkHtml.java | 6 ++-- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPostAttachment.java | 10 +++---- .../clientpackets/RequestPrivateStoreBuy.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRecipeShopListSet.java | 4 +-- .../RequestRecipeShopMessageSet.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../clientpackets/SetPrivateStoreMsgBuy.java | 2 +- .../clientpackets/SetPrivateStoreMsgSell.java | 2 +- .../SetPrivateStoreWholeMsg.java | 2 +- .../RequestChangeAttributeItem.java | 2 +- .../blessing/RequestBlessOptionEnchant.java | 2 +- .../commission/RequestCommissionRegister.java | 12 ++++---- .../primeshop/RequestBRBuyProduct.java | 4 +-- .../primeshop/RequestBRPresentBuyProduct.java | 4 +-- .../serverpackets/SellListProcure.java | 2 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../CastleChamberlain/CastleChamberlain.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 4 +-- .../scripts/handlers/bypasshandlers/Link.java | 4 +-- .../handlers/communityboard/ClanBoard.java | 4 +-- .../communityboard/FavoriteBoard.java | 6 ++-- .../handlers/communityboard/HomeBoard.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../scripts/instances/AbstractInstance.java | 2 +- .../gameserver/data/xml/MultisellData.java | 2 +- .../handler/AdminCommandHandler.java | 2 +- .../l2jmobius/gameserver/model/TradeList.java | 2 +- .../gameserver/model/actor/Player.java | 14 +++++----- .../model/actor/instance/Teleporter.java | 8 +++--- .../model/actor/instance/VillageMaster.java | 6 ++-- .../gameserver/model/quest/Quest.java | 4 +-- .../model/teleporter/TeleportHolder.java | 6 ++-- .../clientpackets/RequestAcquireSkill.java | 16 +++++------ .../clientpackets/RequestActionUse.java | 2 +- .../clientpackets/RequestBypassToServer.java | 4 +-- .../RequestCancelPostAttachment.java | 8 +++--- .../clientpackets/RequestCrystallizeItem.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestEnchantItem.java | 8 +++--- .../RequestExEnchantItemAttribute.java | 4 +-- .../clientpackets/RequestGetBossRecord.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../clientpackets/RequestLinkHtml.java | 6 ++-- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPostAttachment.java | 10 +++---- .../clientpackets/RequestPrivateStoreBuy.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRecipeShopListSet.java | 4 +-- .../RequestRecipeShopMessageSet.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../clientpackets/SetPrivateStoreMsgBuy.java | 2 +- .../clientpackets/SetPrivateStoreMsgSell.java | 2 +- .../SetPrivateStoreWholeMsg.java | 2 +- .../RequestChangeAttributeItem.java | 2 +- .../blessing/RequestBlessOptionEnchant.java | 2 +- .../commission/RequestCommissionRegister.java | 12 ++++---- .../primeshop/RequestBRBuyProduct.java | 4 +-- .../primeshop/RequestBRPresentBuyProduct.java | 4 +-- .../serverpackets/SellListProcure.java | 2 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../CastleChamberlain/CastleChamberlain.java | 2 +- .../ai/others/ClassMaster/ClassMaster.java | 4 +-- .../scripts/handlers/bypasshandlers/Link.java | 4 +-- .../handlers/communityboard/ClanBoard.java | 4 +-- .../communityboard/FavoriteBoard.java | 6 ++-- .../handlers/communityboard/HomeBoard.java | 2 +- .../handlers/communityboard/RegionBoard.java | 2 +- .../scripts/instances/AbstractInstance.java | 2 +- .../gameserver/data/xml/MultisellData.java | 2 +- .../handler/AdminCommandHandler.java | 2 +- .../l2jmobius/gameserver/model/TradeList.java | 2 +- .../gameserver/model/actor/Player.java | 14 +++++----- .../model/actor/instance/Teleporter.java | 8 +++--- .../model/actor/instance/VillageMaster.java | 6 ++-- .../gameserver/model/quest/Quest.java | 4 +-- .../model/teleporter/TeleportHolder.java | 6 ++-- .../clientpackets/RequestAcquireSkill.java | 16 +++++------ .../clientpackets/RequestActionUse.java | 2 +- .../clientpackets/RequestBypassToServer.java | 4 +-- .../RequestCancelPostAttachment.java | 8 +++--- .../clientpackets/RequestCrystallizeItem.java | 2 +- .../RequestDeleteReceivedPost.java | 2 +- .../clientpackets/RequestDeleteSentPost.java | 2 +- .../clientpackets/RequestEnchantItem.java | 8 +++--- .../RequestExEnchantItemAttribute.java | 4 +-- .../clientpackets/RequestGetBossRecord.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../clientpackets/RequestLinkHtml.java | 6 ++-- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPostAttachment.java | 10 +++---- .../clientpackets/RequestPrivateStoreBuy.java | 2 +- .../clientpackets/RequestReceivedPost.java | 2 +- .../RequestRecipeShopListSet.java | 4 +-- .../RequestRecipeShopMessageSet.java | 2 +- .../RequestRejectPostAttachment.java | 2 +- .../clientpackets/RequestSentPost.java | 2 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../clientpackets/SetPrivateStoreMsgBuy.java | 2 +- .../clientpackets/SetPrivateStoreMsgSell.java | 2 +- .../SetPrivateStoreWholeMsg.java | 2 +- .../RequestChangeAttributeItem.java | 2 +- .../blessing/RequestBlessOptionEnchant.java | 2 +- .../commission/RequestCommissionRegister.java | 12 ++++---- .../primeshop/RequestBRBuyProduct.java | 4 +-- .../primeshop/RequestBRPresentBuyProduct.java | 4 +-- .../serverpackets/SellListProcure.java | 2 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- 1254 files changed, 2512 insertions(+), 2512 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java index cfbbc97cae..1a5bad379a 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java @@ -370,7 +370,7 @@ public class TalentShow extends AbstractNpcAI { if ((event == null) || event.isEmpty()) { - LOGGER.warning("MC_Show: Null/Empty event for npc " + npc + " and player " + player + "!"); + LOGGER.warning("MC_Show: Null/Empty event for " + npc + " and " + player + "!"); return null; } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index 4c24eb02bf..f1fd3813c2 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -1247,7 +1247,7 @@ public class CastleChamberlain extends AbstractNpcAI } default: { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java index 69e9da3624..1ec9bcfd71 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java @@ -784,12 +784,12 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader if (newClass == null) { - LOGGER.warning(getClass().getSimpleName() + ": No new classId found for player " + player); + LOGGER.warning(getClass().getSimpleName() + ": No new classId found for " + player); return false; } else if (newClass == player.getClassId()) { - LOGGER.warning(getClass().getSimpleName() + ": New classId found for player " + player + " is exactly the same as the one he currently is!"); + LOGGER.warning(getClass().getSimpleName() + ": New classId found for " + player + " is exactly the same as the one he currently is!"); return false; } else if (checkIfClassChangeHasOptions(player)) diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java index c621669129..8d38a27541 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java @@ -163,7 +163,7 @@ public class ManorManager extends AbstractNpcAI } default: { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java index 994b1e29c1..51eb102f5e 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java @@ -125,7 +125,7 @@ public class SkillTransfer extends AbstractNpcAI if (count < 0) { final String className = ClassListData.getInstance().getClass(player.getClassId()).getClassName(); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " has too many transfered skills or items, skill:" + s.getName() + " (" + sk.getId() + "/" + sk.getLevel() + "), class:" + className, IllegalActionPunishmentType.BROADCAST); + Util.handleIllegalPlayerAction(player, player + " has too many transfered skills or items, skill:" + s.getName() + " (" + sk.getId() + "/" + sk.getLevel() + "), class:" + className, IllegalActionPunishmentType.BROADCAST); if (Config.SKILL_CHECK_REMOVE) { player.removeSkill(sk); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Link.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Link.java index 3793c6203a..493e43e6f8 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Link.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Link.java @@ -79,13 +79,13 @@ public class Link implements IBypassHandler final String htmlPath = command.substring(4).trim(); if (htmlPath.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty link html!"); + LOGGER.warning(player + " sent empty link html!"); return false; } if (htmlPath.contains("..")) { - LOGGER.warning("Player " + player.getName() + " sent invalid link html: " + htmlPath); + LOGGER.warning(player + " sent invalid link html: " + htmlPath); return false; } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/communityboard/ClanBoard.java index 3bfdf86486..a205475a6c 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/communityboard/ClanBoard.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/communityboard/ClanBoard.java @@ -77,7 +77,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanList(player, 1); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan list bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan list bypass " + command + "!"); } } } @@ -97,7 +97,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanHome(player); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan home bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan home bypass " + command + "!"); } } } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java index dc54e01a0b..df4f03d172 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java @@ -83,7 +83,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for " + player); } } else if (command.startsWith("bbs_add_fav")) @@ -110,7 +110,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for " + player); } } } @@ -134,7 +134,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for " + player); } } return true; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/communityboard/HomeBoard.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/communityboard/HomeBoard.java index 86c5869161..1124c98ea4 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/communityboard/HomeBoard.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/communityboard/HomeBoard.java @@ -354,7 +354,7 @@ public class HomeBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for " + player); } return count; } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/communityboard/RegionBoard.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/communityboard/RegionBoard.java index 0c5abf5c5a..c6a4392f6a 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/communityboard/RegionBoard.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/communityboard/RegionBoard.java @@ -80,7 +80,7 @@ public class RegionBoard implements IWriteBoardHandler final String id = command.replace("_bbsloc;", ""); if (!Util.isDigit(id)) { - LOG.warning(RegionBoard.class.getSimpleName() + ": Player " + player + " sent and invalid region bypass " + command + "!"); + LOG.warning(RegionBoard.class.getSimpleName() + ": " + player + " sent and invalid region bypass " + command + "!"); return false; } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/AbstractInstance.java index 06415e9d40..94c337f0df 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/AbstractInstance.java @@ -124,7 +124,7 @@ public abstract class AbstractInstance extends AbstractNpcAI final InstanceTemplate template = manager.getInstanceTemplate(templateId); if (template == null) { - LOGGER.warning("Player " + player.getName() + " (" + player.getObjectId() + ") wants to create instance with unknown template id " + templateId + "!"); + LOGGER.warning(player + " wants to create instance with unknown template id " + templateId + "!"); return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 73914d140e..e288979088 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -278,7 +278,7 @@ public class MultisellData implements IXmlReader } else { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); return; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index 34c26f1ed0..c9bd4ec11e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -99,7 +99,7 @@ public class AdminCommandHandler implements IHandler 0) { @@ -6643,7 +6643,7 @@ public class Player extends Playable // a possible restart-while-modifysubclass cheat has been attempted. // Switching to use base class player.setClassId(player.getBaseClass()); - LOGGER.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); + LOGGER.warning(player + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); } else { @@ -12876,12 +12876,12 @@ public class Player extends Playable if (nextLevel == -1) { - LOGGER.info("Removing skill " + skill + " from player " + toString()); + LOGGER.info("Removing skill " + skill + " from " + this); removeSkill(skill, true); // there is no lower skill } else { - LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString()); + LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for " + this); addSkill(SkillData.getInstance().getSkill(skill.getId(), nextLevel), true); // replace with lower one } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java index 0ed14075da..7fa696fa80 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java @@ -99,7 +99,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -111,7 +111,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -122,7 +122,7 @@ public class Teleporter extends Npc // Check for required count of params. if (st.countTokens() != 2) { - LOGGER.warning("Player " + player.getObjectId() + " send unhandled teleport command: " + command); + LOGGER.warning(player + " send unhandled teleport command: " + command); return; } @@ -130,7 +130,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); + LOGGER.warning(player + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); return; } holder.doTeleport(player, this, parseNextInt(st, -1)); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/Quest.java index de105deb43..debfdf285b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -1586,7 +1586,7 @@ public class Quest extends AbstractScript implements IIdentifiable final Quest q = QuestManager.getInstance().getQuest(questId); if (q == null) { - LOGGER.finer("Unknown quest " + questId + " for player " + player.getName()); + LOGGER.finer("Unknown quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestData.setInt(1, player.getObjectId()); @@ -1617,7 +1617,7 @@ public class Quest extends AbstractScript implements IIdentifiable final QuestState qs = player.getQuestState(questId); if (qs == null) { - LOGGER.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); + LOGGER.finer("Lost variable " + var + " in quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestDataVar.setInt(1, player.getObjectId()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index 1c31ff4a11..eb1434ff89 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -135,7 +135,7 @@ public class TeleportHolder { if (isNoblesse() && !player.isNoble()) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } @@ -194,14 +194,14 @@ public class TeleportHolder { if (isNoblesse() && !player.isNoble()) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } final TeleportLocation loc = getLocation(locId); if (loc == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport location " + locId + " within list " + _name + "!"); + LOGGER.warning(player + " requested unknown teleport location " + locId + " within list " + _name + "!"); return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index 2c40256569..c61015b069 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -120,7 +120,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": " + player + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -137,7 +137,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { // The previous level skill has not been learned. player.sendPacket(SystemMessageId.THE_PREVIOUS_LEVEL_SKILL_HAS_NOT_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } } @@ -164,7 +164,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!canTransform(player)) { player.sendPacket(SystemMessageId.YOU_HAVE_NOT_COMPLETED_THE_NECESSARY_QUEST_FOR_SKILL_ACQUISITION); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); return; } @@ -248,7 +248,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!clan.isLearnableSubPledgeSkill(skill, _subType)) { player.sendPacket(SystemMessageId.THIS_SQUAD_SKILL_HAS_ALREADY_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } @@ -310,7 +310,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -340,7 +340,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -403,13 +403,13 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } if ((player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); return; } @@ -425,7 +425,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (count >= 2) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); return; } @@ -454,14 +454,14 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive() && !player.isDualClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } if ((player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); return; } @@ -477,7 +477,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (count >= 2) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); return; } @@ -563,7 +563,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (skillLearn.getGetLevel() > player.getLevel()) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_SKILL_LEVEL_REQUIREMENTS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); return false; } @@ -632,7 +632,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { if (!player.destroyItemByItemId("SkillLearn", itemIdCount.getId(), itemIdCount.getCount(), trainer, true)) { - Util.handleIllegalPlayerAction(player, "Somehow player " + player.getName() + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, "Somehow " + player + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); } } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index 6ac4cc7ca0..0b8b67f9a0 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -91,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { player.sendPacket(ActionFailed.STATIC_PACKET); - PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 4d8e55bc8e..a64477703b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -90,7 +90,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning(player + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -301,7 +301,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (Exception e) { - PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _command + " " + e.getMessage()); + PacketLogger.warning("Exception processing bypass from " + player + ": " + _command + " " + e.getMessage()); if (player.isGM()) { final StringBuilder sb = new StringBuilder(200); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 5d4b260a76..90500671bf 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -69,7 +69,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to cancel not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to cancel not own post!", Config.DEFAULT_PUNISH); return; } @@ -121,19 +121,19 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items not from mail !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items not from mail !", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 1491cb1bfb..6b1a8b5d37 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -89,7 +89,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info(player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java index 6d59e89936..8685cb4867 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java @@ -77,7 +77,7 @@ public class RequestDeleteReceivedPost implements IClientIncomingPacket } if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java index 88fd8b949d..c4d3846ad7 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java @@ -77,7 +77,7 @@ public class RequestDeleteSentPost implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 63765d269a..800852ad71 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -129,7 +129,7 @@ public class RequestEnchantItem implements IClientIncomingPacket // fast auto-enchant cheat check if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " use autoenchant program ", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -139,7 +139,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", scroll.getObjectId(), 1, player, item) == null) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -149,7 +149,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if ((support != null) && (player.getInventory().destroyItem("Enchant", support.getObjectId(), 1, player, item) == null)) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -353,7 +353,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", item, player, null) == null) { // unable to destroy item, cheater ? - Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from player " + player.getName() + ", possible cheater !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from " + player + ", possible cheater !", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); if (Config.LOG_ITEM_ENCHANTS) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index f6b8d47c50..6630088f2a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -126,7 +126,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket default: { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } } @@ -159,7 +159,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket if (attribute.getType() == opositeElement) { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); return; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java index dc903790d0..27ced7e5f8 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java @@ -45,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - PacketLogger.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning(player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); } } \ No newline at end of file diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 3831df74ef..1c68221c0d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -61,7 +61,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 7253226656..0fb3a57829 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -53,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from " + player); } player.sendPacket(ActionFailed.STATIC_PACKET); return; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 79db1768e6..044ebba720 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -51,7 +51,7 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 1c19213904..639d2105e3 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -76,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " requested Henna Draw remove without any henna."); player.sendPacket(ActionFailed.STATIC_PACKET); } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java index 2cdc066ead..f5713d967d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java @@ -50,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty html link!"); + PacketLogger.warning(player + " sent empty html link!"); return; } if (_link.contains("..")) { - PacketLogger.warning("Player " + player.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning(player + " sent invalid html link: link " + _link); return; } final int htmlObjectId = player.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - PacketLogger.warning("Player " + player.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning(player + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 14eb0ff29b..7570e3e5e2 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -93,7 +93,7 @@ public class RequestPackageSend implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index e1e1402fb5..c3a945d274 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -108,7 +108,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own attachment!", Config.DEFAULT_PUNISH); return; } @@ -135,19 +135,19 @@ public class RequestPostAttachment implements IClientIncomingPacket // Calculate needed slots if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } @@ -194,7 +194,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java index 2ded12e55d..f70e24e74c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java @@ -135,7 +135,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket if ((storePlayer.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL) && (storeList.getItemCount() > _items.size())) { - final String msgErr = "[RequestPrivateStoreBuy] player " + player.getName() + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; + final String msgErr = "[RequestPrivateStoreBuy] " + player + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java index 6ffcc69313..cbf78835a6 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java @@ -65,7 +65,7 @@ public class RequestReceivedPost implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to receive not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to receive not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java index fd6b816fde..940d50e635 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java @@ -103,7 +103,7 @@ public class RequestRecipeShopListSet implements IClientIncomingPacket final RecipeList list = RecipeData.getInstance().getRecipeList(i.getRecipeId()); 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); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set recipe which he does not have.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java index 55c75f0292..ac8373ebdf 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java @@ -49,7 +49,7 @@ public class RequestRecipeShopMessageSet implements IClientIncomingPacket if ((_name != null) && (_name.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java index 1a7c1ebc0f..154c1276dd 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java @@ -77,7 +77,7 @@ public class RequestRejectPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java index 1cf200da52..9f4036d402 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java @@ -64,7 +64,7 @@ public class RequestSentPost implements IClientIncomingPacket if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to read not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to read not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index c600906d81..5ee37630b2 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -134,7 +134,7 @@ public class Say2 implements IClientIncomingPacket if (Config.L2WALKER_PROTECTION && (chatType == ChatType.WHISPER) && checkBot(_text)) { - Util.handleIllegalPlayerAction(player, "Client Emulator Detect: Player " + player.getName() + " using l2walker.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Client Emulator Detect: " + player + " using L2Walker.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index db6358f368..b332fd9707 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -109,7 +109,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java index 76e8ac2a68..89261d5490 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java index d86bfc8f84..88e04641cf 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java index 2726f99c08..38de85007e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java @@ -50,7 +50,7 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket if ((_msg != null) && (_msg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java index d7e4715886..01b400ebfa 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java @@ -86,7 +86,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket if ((player.getAbilityPoints() == 0) || (player.getAbilityPoints() == player.getAbilityPointsUsed())) { - PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning(player + " is trying to learn ability without ability points!"); return; } @@ -156,7 +156,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 1: Learning skill without having X points spent on the specific tree if (learn.getPointsRequired() > pointsSpent[learn.getTreeId() - 1]) { - PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!"); + PacketLogger.warning(player + " is trying to learn " + skill + " without enough ability points spent!"); player.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -166,7 +166,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket { if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel()) { - PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); + PacketLogger.warning(player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); player.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -175,7 +175,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 3 Learning a skill without having enough points if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points) { - PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning(player + " is trying to learn ability without ability points!"); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index bf64e21529..7def665ec6 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -67,7 +67,7 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); player.sendPacket(ExChangeAttributeFail.STATIC); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java index 7eb252c475..7842f646cd 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java @@ -61,35 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning(player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning(player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (15-day) Extension not found in inventory."); return; } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (30-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (30-day) Extension not found in inventory."); return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 1b6a022140..727ebc986b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -124,12 +124,12 @@ public class RequestBRBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index 44e131c329..6eb754180a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -145,12 +145,12 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 13ef62f55f..db6c5307ee 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -61,7 +61,7 @@ public class SellListProcure implements IClientOutgoingPacket packet.writeQ(entry.getValue()); // count packet.writeH(item.getItem().getType2()); packet.writeH(0); // unknown - packet.writeQ(0); // price, u shouldnt get any adena for crops, only raw materials + packet.writeQ(0); // price, you shouldnt get any adena for crops, only raw materials } return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/Evolve.java index 51de657d97..753072b609 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/Evolve.java @@ -62,7 +62,7 @@ public class Evolve final Pet currentPet = (Pet) pet; if (currentPet.isAlikeDead()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); return false; } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java index cfbbc97cae..1a5bad379a 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java @@ -370,7 +370,7 @@ public class TalentShow extends AbstractNpcAI { if ((event == null) || event.isEmpty()) { - LOGGER.warning("MC_Show: Null/Empty event for npc " + npc + " and player " + player + "!"); + LOGGER.warning("MC_Show: Null/Empty event for " + npc + " and " + player + "!"); return null; } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index 4c24eb02bf..f1fd3813c2 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -1247,7 +1247,7 @@ public class CastleChamberlain extends AbstractNpcAI } default: { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java index e353ad71eb..ab3d82d42a 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java @@ -784,12 +784,12 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader if (newClass == null) { - LOGGER.warning(getClass().getSimpleName() + ": No new classId found for player " + player); + LOGGER.warning(getClass().getSimpleName() + ": No new classId found for " + player); return false; } else if (newClass == player.getClassId()) { - LOGGER.warning(getClass().getSimpleName() + ": New classId found for player " + player + " is exactly the same as the one he currently is!"); + LOGGER.warning(getClass().getSimpleName() + ": New classId found for " + player + " is exactly the same as the one he currently is!"); return false; } else if (checkIfClassChangeHasOptions(player)) diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java index c621669129..8d38a27541 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java @@ -163,7 +163,7 @@ public class ManorManager extends AbstractNpcAI } default: { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java index 994b1e29c1..51eb102f5e 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java @@ -125,7 +125,7 @@ public class SkillTransfer extends AbstractNpcAI if (count < 0) { final String className = ClassListData.getInstance().getClass(player.getClassId()).getClassName(); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " has too many transfered skills or items, skill:" + s.getName() + " (" + sk.getId() + "/" + sk.getLevel() + "), class:" + className, IllegalActionPunishmentType.BROADCAST); + Util.handleIllegalPlayerAction(player, player + " has too many transfered skills or items, skill:" + s.getName() + " (" + sk.getId() + "/" + sk.getLevel() + "), class:" + className, IllegalActionPunishmentType.BROADCAST); if (Config.SKILL_CHECK_REMOVE) { player.removeSkill(sk); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Link.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Link.java index 502fb59aed..2fdb263f0d 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Link.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Link.java @@ -82,13 +82,13 @@ public class Link implements IBypassHandler final String htmlPath = command.substring(4).trim(); if (htmlPath.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty link html!"); + LOGGER.warning(player + " sent empty link html!"); return false; } if (htmlPath.contains("..")) { - LOGGER.warning("Player " + player.getName() + " sent invalid link html: " + htmlPath); + LOGGER.warning(player + " sent invalid link html: " + htmlPath); return false; } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/communityboard/ClanBoard.java index 3bfdf86486..a205475a6c 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/communityboard/ClanBoard.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/communityboard/ClanBoard.java @@ -77,7 +77,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanList(player, 1); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan list bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan list bypass " + command + "!"); } } } @@ -97,7 +97,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanHome(player); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan home bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan home bypass " + command + "!"); } } } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java index dc54e01a0b..df4f03d172 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java @@ -83,7 +83,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for " + player); } } else if (command.startsWith("bbs_add_fav")) @@ -110,7 +110,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for " + player); } } } @@ -134,7 +134,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for " + player); } } return true; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/communityboard/HomeBoard.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/communityboard/HomeBoard.java index 86c5869161..1124c98ea4 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/communityboard/HomeBoard.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/communityboard/HomeBoard.java @@ -354,7 +354,7 @@ public class HomeBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for " + player); } return count; } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/communityboard/RegionBoard.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/communityboard/RegionBoard.java index 0c5abf5c5a..c6a4392f6a 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/communityboard/RegionBoard.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/communityboard/RegionBoard.java @@ -80,7 +80,7 @@ public class RegionBoard implements IWriteBoardHandler final String id = command.replace("_bbsloc;", ""); if (!Util.isDigit(id)) { - LOG.warning(RegionBoard.class.getSimpleName() + ": Player " + player + " sent and invalid region bypass " + command + "!"); + LOG.warning(RegionBoard.class.getSimpleName() + ": " + player + " sent and invalid region bypass " + command + "!"); return false; } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/AbstractInstance.java index 06415e9d40..94c337f0df 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/AbstractInstance.java @@ -124,7 +124,7 @@ public abstract class AbstractInstance extends AbstractNpcAI final InstanceTemplate template = manager.getInstanceTemplate(templateId); if (template == null) { - LOGGER.warning("Player " + player.getName() + " (" + player.getObjectId() + ") wants to create instance with unknown template id " + templateId + "!"); + LOGGER.warning(player + " wants to create instance with unknown template id " + templateId + "!"); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 73914d140e..e288979088 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -278,7 +278,7 @@ public class MultisellData implements IXmlReader } else { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); return; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index 34c26f1ed0..c9bd4ec11e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -99,7 +99,7 @@ public class AdminCommandHandler implements IHandler 0) { @@ -6646,7 +6646,7 @@ public class Player extends Playable // a possible restart-while-modifysubclass cheat has been attempted. // Switching to use base class player.setClassId(player.getBaseClass()); - LOGGER.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); + LOGGER.warning(player + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); } else { @@ -12879,12 +12879,12 @@ public class Player extends Playable if (nextLevel == -1) { - LOGGER.info("Removing skill " + skill + " from player " + toString()); + LOGGER.info("Removing skill " + skill + " from " + this); removeSkill(skill, true); // there is no lower skill } else { - LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString()); + LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for " + this); addSkill(SkillData.getInstance().getSkill(skill.getId(), nextLevel), true); // replace with lower one } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java index ec84fad1e8..b6645ac312 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java @@ -99,7 +99,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -111,7 +111,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -122,7 +122,7 @@ public class Teleporter extends Npc // Check for required count of params. if (st.countTokens() != 2) { - LOGGER.warning("Player " + player.getObjectId() + " send unhandled teleport command: " + command); + LOGGER.warning(player + " send unhandled teleport command: " + command); return; } @@ -130,7 +130,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); + LOGGER.warning(player + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); return; } holder.doTeleport(player, this, parseNextInt(st, -1)); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/quest/Quest.java index 12a53caacf..e87d0ddaa4 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -1588,7 +1588,7 @@ public class Quest extends AbstractScript implements IIdentifiable final Quest q = QuestManager.getInstance().getQuest(questId); if (q == null) { - LOGGER.finer("Unknown quest " + questId + " for player " + player.getName()); + LOGGER.finer("Unknown quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestData.setInt(1, player.getObjectId()); @@ -1619,7 +1619,7 @@ public class Quest extends AbstractScript implements IIdentifiable final QuestState qs = player.getQuestState(questId); if (qs == null) { - LOGGER.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); + LOGGER.finer("Lost variable " + var + " in quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestDataVar.setInt(1, player.getObjectId()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index 59a7a0e0bb..56a0436a24 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -135,7 +135,7 @@ public class TeleportHolder { if (isNoblesse() && (player.getNobleLevel() < 1)) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } @@ -194,14 +194,14 @@ public class TeleportHolder { if (isNoblesse() && (player.getNobleLevel() < 1)) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } final TeleportLocation loc = getLocation(locId); if (loc == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport location " + locId + " within list " + _name + "!"); + LOGGER.warning(player + " requested unknown teleport location " + locId + " within list " + _name + "!"); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index 0826beb55c..847dba8aba 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -120,7 +120,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": " + player + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -137,7 +137,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { // The previous level skill has not been learned. player.sendPacket(SystemMessageId.THE_PREVIOUS_LEVEL_SKILL_HAS_NOT_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } } @@ -164,7 +164,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!canTransform(player)) { player.sendPacket(SystemMessageId.YOU_HAVE_NOT_COMPLETED_THE_NECESSARY_QUEST_FOR_SKILL_ACQUISITION); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); return; } @@ -248,7 +248,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!clan.isLearnableSubPledgeSkill(skill, _subType)) { player.sendPacket(SystemMessageId.THIS_SQUAD_SKILL_HAS_ALREADY_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } @@ -310,7 +310,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -340,7 +340,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -403,13 +403,13 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } if ((player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); return; } @@ -425,7 +425,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (count >= 2) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); return; } @@ -454,14 +454,14 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive() && !player.isDualClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } if ((player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); return; } @@ -477,7 +477,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (count >= 2) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); return; } @@ -563,7 +563,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (skillLearn.getGetLevel() > player.getLevel()) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_SKILL_LEVEL_REQUIREMENTS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); return false; } @@ -632,7 +632,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { if (!player.destroyItemByItemId("SkillLearn", itemIdCount.getId(), itemIdCount.getCount(), trainer, true)) { - Util.handleIllegalPlayerAction(player, "Somehow player " + player.getName() + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, "Somehow " + player + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); } } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index 6ac4cc7ca0..0b8b67f9a0 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -91,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { player.sendPacket(ActionFailed.STATIC_PACKET); - PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 4d8e55bc8e..a64477703b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -90,7 +90,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning(player + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -301,7 +301,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (Exception e) { - PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _command + " " + e.getMessage()); + PacketLogger.warning("Exception processing bypass from " + player + ": " + _command + " " + e.getMessage()); if (player.isGM()) { final StringBuilder sb = new StringBuilder(200); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 5d4b260a76..90500671bf 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -69,7 +69,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to cancel not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to cancel not own post!", Config.DEFAULT_PUNISH); return; } @@ -121,19 +121,19 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items not from mail !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items not from mail !", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 1491cb1bfb..6b1a8b5d37 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -89,7 +89,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info(player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java index 6d59e89936..8685cb4867 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java @@ -77,7 +77,7 @@ public class RequestDeleteReceivedPost implements IClientIncomingPacket } if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java index 88fd8b949d..c4d3846ad7 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java @@ -77,7 +77,7 @@ public class RequestDeleteSentPost implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 3e97218445..1a32c04441 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -129,7 +129,7 @@ public class RequestEnchantItem implements IClientIncomingPacket // fast auto-enchant cheat check if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " use autoenchant program ", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -139,7 +139,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", scroll.getObjectId(), 1, player, item) == null) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -149,7 +149,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if ((support != null) && (player.getInventory().destroyItem("Enchant", support.getObjectId(), 1, player, item) == null)) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -353,7 +353,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", item, player, null) == null) { // unable to destroy item, cheater ? - Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from player " + player.getName() + ", possible cheater !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from " + player + ", possible cheater !", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); if (Config.LOG_ITEM_ENCHANTS) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index f6b8d47c50..6630088f2a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -126,7 +126,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket default: { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } } @@ -159,7 +159,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket if (attribute.getType() == opositeElement) { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); return; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java index dc903790d0..27ced7e5f8 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java @@ -45,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - PacketLogger.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning(player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); } } \ No newline at end of file diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 3831df74ef..1c68221c0d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -61,7 +61,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 7253226656..0fb3a57829 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -53,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from " + player); } player.sendPacket(ActionFailed.STATIC_PACKET); return; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 79db1768e6..044ebba720 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -51,7 +51,7 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 1c19213904..639d2105e3 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -76,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " requested Henna Draw remove without any henna."); player.sendPacket(ActionFailed.STATIC_PACKET); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java index 2cdc066ead..f5713d967d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java @@ -50,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty html link!"); + PacketLogger.warning(player + " sent empty html link!"); return; } if (_link.contains("..")) { - PacketLogger.warning("Player " + player.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning(player + " sent invalid html link: link " + _link); return; } final int htmlObjectId = player.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - PacketLogger.warning("Player " + player.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning(player + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 14eb0ff29b..7570e3e5e2 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -93,7 +93,7 @@ public class RequestPackageSend implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index e1e1402fb5..c3a945d274 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -108,7 +108,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own attachment!", Config.DEFAULT_PUNISH); return; } @@ -135,19 +135,19 @@ public class RequestPostAttachment implements IClientIncomingPacket // Calculate needed slots if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } @@ -194,7 +194,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java index 2ded12e55d..f70e24e74c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java @@ -135,7 +135,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket if ((storePlayer.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL) && (storeList.getItemCount() > _items.size())) { - final String msgErr = "[RequestPrivateStoreBuy] player " + player.getName() + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; + final String msgErr = "[RequestPrivateStoreBuy] " + player + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java index 6ffcc69313..cbf78835a6 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java @@ -65,7 +65,7 @@ public class RequestReceivedPost implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to receive not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to receive not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java index fd6b816fde..940d50e635 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java @@ -103,7 +103,7 @@ public class RequestRecipeShopListSet implements IClientIncomingPacket final RecipeList list = RecipeData.getInstance().getRecipeList(i.getRecipeId()); 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); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set recipe which he does not have.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java index 55c75f0292..ac8373ebdf 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java @@ -49,7 +49,7 @@ public class RequestRecipeShopMessageSet implements IClientIncomingPacket if ((_name != null) && (_name.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java index 1a7c1ebc0f..154c1276dd 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java @@ -77,7 +77,7 @@ public class RequestRejectPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java index 1cf200da52..9f4036d402 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java @@ -64,7 +64,7 @@ public class RequestSentPost implements IClientIncomingPacket if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to read not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to read not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index c600906d81..5ee37630b2 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -134,7 +134,7 @@ public class Say2 implements IClientIncomingPacket if (Config.L2WALKER_PROTECTION && (chatType == ChatType.WHISPER) && checkBot(_text)) { - Util.handleIllegalPlayerAction(player, "Client Emulator Detect: Player " + player.getName() + " using l2walker.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Client Emulator Detect: " + player + " using L2Walker.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index db6358f368..b332fd9707 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -109,7 +109,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java index 76e8ac2a68..89261d5490 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java index d86bfc8f84..88e04641cf 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java index 2726f99c08..38de85007e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java @@ -50,7 +50,7 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket if ((_msg != null) && (_msg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java index 623803ddea..875868428b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java @@ -86,7 +86,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket if ((player.getAbilityPoints() == 0) || (player.getAbilityPoints() == player.getAbilityPointsUsed())) { - PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning(player + " is trying to learn ability without ability points!"); return; } @@ -156,7 +156,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 1: Learning skill without having X points spent on the specific tree if (learn.getPointsRequired() > pointsSpent[learn.getTreeId() - 1]) { - PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!"); + PacketLogger.warning(player + " is trying to learn " + skill + " without enough ability points spent!"); player.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -166,7 +166,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket { if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel()) { - PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); + PacketLogger.warning(player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); player.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -175,7 +175,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 3 Learning a skill without having enough points if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points) { - PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning(player + " is trying to learn ability without ability points!"); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index bf64e21529..7def665ec6 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -67,7 +67,7 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); player.sendPacket(ExChangeAttributeFail.STATIC); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java index 7eb252c475..7842f646cd 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java @@ -61,35 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning(player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning(player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (15-day) Extension not found in inventory."); return; } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (30-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (30-day) Extension not found in inventory."); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 1b6a022140..727ebc986b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -124,12 +124,12 @@ public class RequestBRBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index 44e131c329..6eb754180a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -145,12 +145,12 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 13ef62f55f..db6c5307ee 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -61,7 +61,7 @@ public class SellListProcure implements IClientOutgoingPacket packet.writeQ(entry.getValue()); // count packet.writeH(item.getItem().getType2()); packet.writeH(0); // unknown - packet.writeQ(0); // price, u shouldnt get any adena for crops, only raw materials + packet.writeQ(0); // price, you shouldnt get any adena for crops, only raw materials } return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/Evolve.java index 51de657d97..753072b609 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/Evolve.java @@ -62,7 +62,7 @@ public class Evolve final Pet currentPet = (Pet) pet; if (currentPet.isAlikeDead()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); return false; } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java index cfbbc97cae..1a5bad379a 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java @@ -370,7 +370,7 @@ public class TalentShow extends AbstractNpcAI { if ((event == null) || event.isEmpty()) { - LOGGER.warning("MC_Show: Null/Empty event for npc " + npc + " and player " + player + "!"); + LOGGER.warning("MC_Show: Null/Empty event for " + npc + " and " + player + "!"); return null; } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index 4c24eb02bf..f1fd3813c2 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -1247,7 +1247,7 @@ public class CastleChamberlain extends AbstractNpcAI } default: { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java index 3f454fc2e0..3bbdfc4b16 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java @@ -784,12 +784,12 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader if (newClass == null) { - LOGGER.warning(getClass().getSimpleName() + ": No new classId found for player " + player); + LOGGER.warning(getClass().getSimpleName() + ": No new classId found for " + player); return false; } else if (newClass == player.getClassId()) { - LOGGER.warning(getClass().getSimpleName() + ": New classId found for player " + player + " is exactly the same as the one he currently is!"); + LOGGER.warning(getClass().getSimpleName() + ": New classId found for " + player + " is exactly the same as the one he currently is!"); return false; } else if (checkIfClassChangeHasOptions(player)) diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java index c621669129..8d38a27541 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java @@ -163,7 +163,7 @@ public class ManorManager extends AbstractNpcAI } default: { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java index 994b1e29c1..51eb102f5e 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java @@ -125,7 +125,7 @@ public class SkillTransfer extends AbstractNpcAI if (count < 0) { final String className = ClassListData.getInstance().getClass(player.getClassId()).getClassName(); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " has too many transfered skills or items, skill:" + s.getName() + " (" + sk.getId() + "/" + sk.getLevel() + "), class:" + className, IllegalActionPunishmentType.BROADCAST); + Util.handleIllegalPlayerAction(player, player + " has too many transfered skills or items, skill:" + s.getName() + " (" + sk.getId() + "/" + sk.getLevel() + "), class:" + className, IllegalActionPunishmentType.BROADCAST); if (Config.SKILL_CHECK_REMOVE) { player.removeSkill(sk); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Link.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Link.java index 502fb59aed..2fdb263f0d 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Link.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Link.java @@ -82,13 +82,13 @@ public class Link implements IBypassHandler final String htmlPath = command.substring(4).trim(); if (htmlPath.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty link html!"); + LOGGER.warning(player + " sent empty link html!"); return false; } if (htmlPath.contains("..")) { - LOGGER.warning("Player " + player.getName() + " sent invalid link html: " + htmlPath); + LOGGER.warning(player + " sent invalid link html: " + htmlPath); return false; } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/communityboard/ClanBoard.java index 3bfdf86486..a205475a6c 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/communityboard/ClanBoard.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/communityboard/ClanBoard.java @@ -77,7 +77,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanList(player, 1); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan list bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan list bypass " + command + "!"); } } } @@ -97,7 +97,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanHome(player); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan home bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan home bypass " + command + "!"); } } } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java index dc54e01a0b..df4f03d172 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java @@ -83,7 +83,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for " + player); } } else if (command.startsWith("bbs_add_fav")) @@ -110,7 +110,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for " + player); } } } @@ -134,7 +134,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for " + player); } } return true; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/communityboard/HomeBoard.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/communityboard/HomeBoard.java index 86c5869161..1124c98ea4 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/communityboard/HomeBoard.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/communityboard/HomeBoard.java @@ -354,7 +354,7 @@ public class HomeBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for " + player); } return count; } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/communityboard/RegionBoard.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/communityboard/RegionBoard.java index 0c5abf5c5a..c6a4392f6a 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/communityboard/RegionBoard.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/communityboard/RegionBoard.java @@ -80,7 +80,7 @@ public class RegionBoard implements IWriteBoardHandler final String id = command.replace("_bbsloc;", ""); if (!Util.isDigit(id)) { - LOG.warning(RegionBoard.class.getSimpleName() + ": Player " + player + " sent and invalid region bypass " + command + "!"); + LOG.warning(RegionBoard.class.getSimpleName() + ": " + player + " sent and invalid region bypass " + command + "!"); return false; } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/AbstractInstance.java index 06415e9d40..94c337f0df 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/AbstractInstance.java @@ -124,7 +124,7 @@ public abstract class AbstractInstance extends AbstractNpcAI final InstanceTemplate template = manager.getInstanceTemplate(templateId); if (template == null) { - LOGGER.warning("Player " + player.getName() + " (" + player.getObjectId() + ") wants to create instance with unknown template id " + templateId + "!"); + LOGGER.warning(player + " wants to create instance with unknown template id " + templateId + "!"); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 73914d140e..e288979088 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -278,7 +278,7 @@ public class MultisellData implements IXmlReader } else { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); return; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index 34c26f1ed0..c9bd4ec11e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -99,7 +99,7 @@ public class AdminCommandHandler implements IHandler 0) { @@ -6648,7 +6648,7 @@ public class Player extends Playable // a possible restart-while-modifysubclass cheat has been attempted. // Switching to use base class player.setClassId(player.getBaseClass()); - LOGGER.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); + LOGGER.warning(player + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); } else { @@ -12881,12 +12881,12 @@ public class Player extends Playable if (nextLevel == -1) { - LOGGER.info("Removing skill " + skill + " from player " + toString()); + LOGGER.info("Removing skill " + skill + " from " + this); removeSkill(skill, true); // there is no lower skill } else { - LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString()); + LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for " + this); addSkill(SkillData.getInstance().getSkill(skill.getId(), nextLevel), true); // replace with lower one } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java index ec84fad1e8..b6645ac312 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java @@ -99,7 +99,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -111,7 +111,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -122,7 +122,7 @@ public class Teleporter extends Npc // Check for required count of params. if (st.countTokens() != 2) { - LOGGER.warning("Player " + player.getObjectId() + " send unhandled teleport command: " + command); + LOGGER.warning(player + " send unhandled teleport command: " + command); return; } @@ -130,7 +130,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); + LOGGER.warning(player + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); return; } holder.doTeleport(player, this, parseNextInt(st, -1)); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/quest/Quest.java index fa5c70ddc0..5ab5b51264 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -1589,7 +1589,7 @@ public class Quest extends AbstractScript implements IIdentifiable final Quest q = QuestManager.getInstance().getQuest(questId); if (q == null) { - LOGGER.finer("Unknown quest " + questId + " for player " + player.getName()); + LOGGER.finer("Unknown quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestData.setInt(1, player.getObjectId()); @@ -1620,7 +1620,7 @@ public class Quest extends AbstractScript implements IIdentifiable final QuestState qs = player.getQuestState(questId); if (qs == null) { - LOGGER.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); + LOGGER.finer("Lost variable " + var + " in quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestDataVar.setInt(1, player.getObjectId()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index 59a7a0e0bb..56a0436a24 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -135,7 +135,7 @@ public class TeleportHolder { if (isNoblesse() && (player.getNobleLevel() < 1)) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } @@ -194,14 +194,14 @@ public class TeleportHolder { if (isNoblesse() && (player.getNobleLevel() < 1)) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } final TeleportLocation loc = getLocation(locId); if (loc == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport location " + locId + " within list " + _name + "!"); + LOGGER.warning(player + " requested unknown teleport location " + locId + " within list " + _name + "!"); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index 0826beb55c..847dba8aba 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -120,7 +120,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": " + player + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -137,7 +137,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { // The previous level skill has not been learned. player.sendPacket(SystemMessageId.THE_PREVIOUS_LEVEL_SKILL_HAS_NOT_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } } @@ -164,7 +164,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!canTransform(player)) { player.sendPacket(SystemMessageId.YOU_HAVE_NOT_COMPLETED_THE_NECESSARY_QUEST_FOR_SKILL_ACQUISITION); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); return; } @@ -248,7 +248,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!clan.isLearnableSubPledgeSkill(skill, _subType)) { player.sendPacket(SystemMessageId.THIS_SQUAD_SKILL_HAS_ALREADY_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } @@ -310,7 +310,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -340,7 +340,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -403,13 +403,13 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } if ((player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); return; } @@ -425,7 +425,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (count >= 2) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); return; } @@ -454,14 +454,14 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive() && !player.isDualClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } if ((player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); return; } @@ -477,7 +477,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (count >= 2) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); return; } @@ -563,7 +563,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (skillLearn.getGetLevel() > player.getLevel()) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_SKILL_LEVEL_REQUIREMENTS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); return false; } @@ -632,7 +632,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { if (!player.destroyItemByItemId("SkillLearn", itemIdCount.getId(), itemIdCount.getCount(), trainer, true)) { - Util.handleIllegalPlayerAction(player, "Somehow player " + player.getName() + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, "Somehow " + player + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); } } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index 6ac4cc7ca0..0b8b67f9a0 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -91,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { player.sendPacket(ActionFailed.STATIC_PACKET); - PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 4d8e55bc8e..a64477703b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -90,7 +90,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning(player + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -301,7 +301,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (Exception e) { - PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _command + " " + e.getMessage()); + PacketLogger.warning("Exception processing bypass from " + player + ": " + _command + " " + e.getMessage()); if (player.isGM()) { final StringBuilder sb = new StringBuilder(200); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 5d4b260a76..90500671bf 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -69,7 +69,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to cancel not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to cancel not own post!", Config.DEFAULT_PUNISH); return; } @@ -121,19 +121,19 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items not from mail !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items not from mail !", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 1491cb1bfb..6b1a8b5d37 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -89,7 +89,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info(player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java index 6d59e89936..8685cb4867 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java @@ -77,7 +77,7 @@ public class RequestDeleteReceivedPost implements IClientIncomingPacket } if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java index 88fd8b949d..c4d3846ad7 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java @@ -77,7 +77,7 @@ public class RequestDeleteSentPost implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 3e97218445..1a32c04441 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -129,7 +129,7 @@ public class RequestEnchantItem implements IClientIncomingPacket // fast auto-enchant cheat check if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " use autoenchant program ", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -139,7 +139,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", scroll.getObjectId(), 1, player, item) == null) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -149,7 +149,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if ((support != null) && (player.getInventory().destroyItem("Enchant", support.getObjectId(), 1, player, item) == null)) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -353,7 +353,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", item, player, null) == null) { // unable to destroy item, cheater ? - Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from player " + player.getName() + ", possible cheater !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from " + player + ", possible cheater !", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); if (Config.LOG_ITEM_ENCHANTS) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index f6b8d47c50..6630088f2a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -126,7 +126,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket default: { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } } @@ -159,7 +159,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket if (attribute.getType() == opositeElement) { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); return; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java index dc903790d0..27ced7e5f8 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java @@ -45,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - PacketLogger.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning(player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); } } \ No newline at end of file diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 3831df74ef..1c68221c0d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -61,7 +61,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 7253226656..0fb3a57829 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -53,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from " + player); } player.sendPacket(ActionFailed.STATIC_PACKET); return; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 79db1768e6..044ebba720 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -51,7 +51,7 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 1c19213904..639d2105e3 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -76,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " requested Henna Draw remove without any henna."); player.sendPacket(ActionFailed.STATIC_PACKET); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java index 2cdc066ead..f5713d967d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java @@ -50,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty html link!"); + PacketLogger.warning(player + " sent empty html link!"); return; } if (_link.contains("..")) { - PacketLogger.warning("Player " + player.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning(player + " sent invalid html link: link " + _link); return; } final int htmlObjectId = player.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - PacketLogger.warning("Player " + player.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning(player + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 14eb0ff29b..7570e3e5e2 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -93,7 +93,7 @@ public class RequestPackageSend implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index e1e1402fb5..c3a945d274 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -108,7 +108,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own attachment!", Config.DEFAULT_PUNISH); return; } @@ -135,19 +135,19 @@ public class RequestPostAttachment implements IClientIncomingPacket // Calculate needed slots if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } @@ -194,7 +194,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java index 2ded12e55d..f70e24e74c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java @@ -135,7 +135,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket if ((storePlayer.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL) && (storeList.getItemCount() > _items.size())) { - final String msgErr = "[RequestPrivateStoreBuy] player " + player.getName() + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; + final String msgErr = "[RequestPrivateStoreBuy] " + player + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java index 6ffcc69313..cbf78835a6 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java @@ -65,7 +65,7 @@ public class RequestReceivedPost implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to receive not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to receive not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java index fd6b816fde..940d50e635 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java @@ -103,7 +103,7 @@ public class RequestRecipeShopListSet implements IClientIncomingPacket final RecipeList list = RecipeData.getInstance().getRecipeList(i.getRecipeId()); 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); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set recipe which he does not have.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java index 55c75f0292..ac8373ebdf 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java @@ -49,7 +49,7 @@ public class RequestRecipeShopMessageSet implements IClientIncomingPacket if ((_name != null) && (_name.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java index 1a7c1ebc0f..154c1276dd 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java @@ -77,7 +77,7 @@ public class RequestRejectPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java index 1cf200da52..9f4036d402 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java @@ -64,7 +64,7 @@ public class RequestSentPost implements IClientIncomingPacket if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to read not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to read not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 04f5293545..d285ab1b5d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -134,7 +134,7 @@ public class Say2 implements IClientIncomingPacket if (Config.L2WALKER_PROTECTION && (chatType == ChatType.WHISPER) && checkBot(_text)) { - Util.handleIllegalPlayerAction(player, "Client Emulator Detect: Player " + player.getName() + " using l2walker.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Client Emulator Detect: " + player + " using L2Walker.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index db6358f368..b332fd9707 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -109,7 +109,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java index 76e8ac2a68..89261d5490 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java index d86bfc8f84..88e04641cf 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java index 2726f99c08..38de85007e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java @@ -50,7 +50,7 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket if ((_msg != null) && (_msg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java index 623803ddea..875868428b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java @@ -86,7 +86,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket if ((player.getAbilityPoints() == 0) || (player.getAbilityPoints() == player.getAbilityPointsUsed())) { - PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning(player + " is trying to learn ability without ability points!"); return; } @@ -156,7 +156,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 1: Learning skill without having X points spent on the specific tree if (learn.getPointsRequired() > pointsSpent[learn.getTreeId() - 1]) { - PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!"); + PacketLogger.warning(player + " is trying to learn " + skill + " without enough ability points spent!"); player.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -166,7 +166,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket { if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel()) { - PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); + PacketLogger.warning(player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); player.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -175,7 +175,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 3 Learning a skill without having enough points if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points) { - PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning(player + " is trying to learn ability without ability points!"); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index bf64e21529..7def665ec6 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -67,7 +67,7 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); player.sendPacket(ExChangeAttributeFail.STATIC); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java index 7eb252c475..7842f646cd 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java @@ -61,35 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning(player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning(player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (15-day) Extension not found in inventory."); return; } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (30-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (30-day) Extension not found in inventory."); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 1b6a022140..727ebc986b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -124,12 +124,12 @@ public class RequestBRBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index 44e131c329..6eb754180a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -145,12 +145,12 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 13ef62f55f..db6c5307ee 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -61,7 +61,7 @@ public class SellListProcure implements IClientOutgoingPacket packet.writeQ(entry.getValue()); // count packet.writeH(item.getItem().getType2()); packet.writeH(0); // unknown - packet.writeQ(0); // price, u shouldnt get any adena for crops, only raw materials + packet.writeQ(0); // price, you shouldnt get any adena for crops, only raw materials } return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/Evolve.java index 51de657d97..753072b609 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/Evolve.java @@ -62,7 +62,7 @@ public class Evolve final Pet currentPet = (Pet) pet; if (currentPet.isAlikeDead()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); return false; } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java index cfbbc97cae..1a5bad379a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java @@ -370,7 +370,7 @@ public class TalentShow extends AbstractNpcAI { if ((event == null) || event.isEmpty()) { - LOGGER.warning("MC_Show: Null/Empty event for npc " + npc + " and player " + player + "!"); + LOGGER.warning("MC_Show: Null/Empty event for " + npc + " and " + player + "!"); return null; } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index 4c24eb02bf..f1fd3813c2 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -1247,7 +1247,7 @@ public class CastleChamberlain extends AbstractNpcAI } default: { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java index 3f454fc2e0..3bbdfc4b16 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java @@ -784,12 +784,12 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader if (newClass == null) { - LOGGER.warning(getClass().getSimpleName() + ": No new classId found for player " + player); + LOGGER.warning(getClass().getSimpleName() + ": No new classId found for " + player); return false; } else if (newClass == player.getClassId()) { - LOGGER.warning(getClass().getSimpleName() + ": New classId found for player " + player + " is exactly the same as the one he currently is!"); + LOGGER.warning(getClass().getSimpleName() + ": New classId found for " + player + " is exactly the same as the one he currently is!"); return false; } else if (checkIfClassChangeHasOptions(player)) diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java index c621669129..8d38a27541 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java @@ -163,7 +163,7 @@ public class ManorManager extends AbstractNpcAI } default: { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java index 994b1e29c1..51eb102f5e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java @@ -125,7 +125,7 @@ public class SkillTransfer extends AbstractNpcAI if (count < 0) { final String className = ClassListData.getInstance().getClass(player.getClassId()).getClassName(); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " has too many transfered skills or items, skill:" + s.getName() + " (" + sk.getId() + "/" + sk.getLevel() + "), class:" + className, IllegalActionPunishmentType.BROADCAST); + Util.handleIllegalPlayerAction(player, player + " has too many transfered skills or items, skill:" + s.getName() + " (" + sk.getId() + "/" + sk.getLevel() + "), class:" + className, IllegalActionPunishmentType.BROADCAST); if (Config.SKILL_CHECK_REMOVE) { player.removeSkill(sk); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Link.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Link.java index 502fb59aed..2fdb263f0d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Link.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Link.java @@ -82,13 +82,13 @@ public class Link implements IBypassHandler final String htmlPath = command.substring(4).trim(); if (htmlPath.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty link html!"); + LOGGER.warning(player + " sent empty link html!"); return false; } if (htmlPath.contains("..")) { - LOGGER.warning("Player " + player.getName() + " sent invalid link html: " + htmlPath); + LOGGER.warning(player + " sent invalid link html: " + htmlPath); return false; } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/communityboard/ClanBoard.java index 3bfdf86486..a205475a6c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/communityboard/ClanBoard.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/communityboard/ClanBoard.java @@ -77,7 +77,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanList(player, 1); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan list bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan list bypass " + command + "!"); } } } @@ -97,7 +97,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanHome(player); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan home bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan home bypass " + command + "!"); } } } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java index dc54e01a0b..df4f03d172 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java @@ -83,7 +83,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for " + player); } } else if (command.startsWith("bbs_add_fav")) @@ -110,7 +110,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for " + player); } } } @@ -134,7 +134,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for " + player); } } return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/communityboard/HomeBoard.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/communityboard/HomeBoard.java index 86c5869161..1124c98ea4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/communityboard/HomeBoard.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/communityboard/HomeBoard.java @@ -354,7 +354,7 @@ public class HomeBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for " + player); } return count; } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/communityboard/RegionBoard.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/communityboard/RegionBoard.java index 0c5abf5c5a..c6a4392f6a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/communityboard/RegionBoard.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/communityboard/RegionBoard.java @@ -80,7 +80,7 @@ public class RegionBoard implements IWriteBoardHandler final String id = command.replace("_bbsloc;", ""); if (!Util.isDigit(id)) { - LOG.warning(RegionBoard.class.getSimpleName() + ": Player " + player + " sent and invalid region bypass " + command + "!"); + LOG.warning(RegionBoard.class.getSimpleName() + ": " + player + " sent and invalid region bypass " + command + "!"); return false; } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/AbstractInstance.java index 06415e9d40..94c337f0df 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/AbstractInstance.java @@ -124,7 +124,7 @@ public abstract class AbstractInstance extends AbstractNpcAI final InstanceTemplate template = manager.getInstanceTemplate(templateId); if (template == null) { - LOGGER.warning("Player " + player.getName() + " (" + player.getObjectId() + ") wants to create instance with unknown template id " + templateId + "!"); + LOGGER.warning(player + " wants to create instance with unknown template id " + templateId + "!"); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 73914d140e..e288979088 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -278,7 +278,7 @@ public class MultisellData implements IXmlReader } else { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); return; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index 34c26f1ed0..c9bd4ec11e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -99,7 +99,7 @@ public class AdminCommandHandler implements IHandler 0) { @@ -6643,7 +6643,7 @@ public class Player extends Playable // a possible restart-while-modifysubclass cheat has been attempted. // Switching to use base class player.setClassId(player.getBaseClass()); - LOGGER.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); + LOGGER.warning(player + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); } else { @@ -12861,12 +12861,12 @@ public class Player extends Playable if (nextLevel == -1) { - LOGGER.info("Removing skill " + skill + " from player " + toString()); + LOGGER.info("Removing skill " + skill + " from " + this); removeSkill(skill, true); // there is no lower skill } else { - LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString()); + LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for " + this); addSkill(SkillData.getInstance().getSkill(skill.getId(), nextLevel), true); // replace with lower one } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java index ec84fad1e8..b6645ac312 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java @@ -99,7 +99,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -111,7 +111,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -122,7 +122,7 @@ public class Teleporter extends Npc // Check for required count of params. if (st.countTokens() != 2) { - LOGGER.warning("Player " + player.getObjectId() + " send unhandled teleport command: " + command); + LOGGER.warning(player + " send unhandled teleport command: " + command); return; } @@ -130,7 +130,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); + LOGGER.warning(player + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); return; } holder.doTeleport(player, this, parseNextInt(st, -1)); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/Quest.java index 297e2f9e38..70b756f735 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -1589,7 +1589,7 @@ public class Quest extends AbstractScript implements IIdentifiable final Quest q = QuestManager.getInstance().getQuest(questId); if (q == null) { - LOGGER.finer("Unknown quest " + questId + " for player " + player.getName()); + LOGGER.finer("Unknown quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestData.setInt(1, player.getObjectId()); @@ -1620,7 +1620,7 @@ public class Quest extends AbstractScript implements IIdentifiable final QuestState qs = player.getQuestState(questId); if (qs == null) { - LOGGER.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); + LOGGER.finer("Lost variable " + var + " in quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestDataVar.setInt(1, player.getObjectId()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index 59a7a0e0bb..56a0436a24 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -135,7 +135,7 @@ public class TeleportHolder { if (isNoblesse() && (player.getNobleLevel() < 1)) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } @@ -194,14 +194,14 @@ public class TeleportHolder { if (isNoblesse() && (player.getNobleLevel() < 1)) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } final TeleportLocation loc = getLocation(locId); if (loc == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport location " + locId + " within list " + _name + "!"); + LOGGER.warning(player + " requested unknown teleport location " + locId + " within list " + _name + "!"); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index 0826beb55c..847dba8aba 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -120,7 +120,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": " + player + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -137,7 +137,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { // The previous level skill has not been learned. player.sendPacket(SystemMessageId.THE_PREVIOUS_LEVEL_SKILL_HAS_NOT_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } } @@ -164,7 +164,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!canTransform(player)) { player.sendPacket(SystemMessageId.YOU_HAVE_NOT_COMPLETED_THE_NECESSARY_QUEST_FOR_SKILL_ACQUISITION); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); return; } @@ -248,7 +248,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!clan.isLearnableSubPledgeSkill(skill, _subType)) { player.sendPacket(SystemMessageId.THIS_SQUAD_SKILL_HAS_ALREADY_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } @@ -310,7 +310,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -340,7 +340,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -403,13 +403,13 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } if ((player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); return; } @@ -425,7 +425,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (count >= 2) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); return; } @@ -454,14 +454,14 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive() && !player.isDualClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } if ((player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); return; } @@ -477,7 +477,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (count >= 2) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); return; } @@ -563,7 +563,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (skillLearn.getGetLevel() > player.getLevel()) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_SKILL_LEVEL_REQUIREMENTS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); return false; } @@ -632,7 +632,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { if (!player.destroyItemByItemId("SkillLearn", itemIdCount.getId(), itemIdCount.getCount(), trainer, true)) { - Util.handleIllegalPlayerAction(player, "Somehow player " + player.getName() + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, "Somehow " + player + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); } } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index 6ac4cc7ca0..0b8b67f9a0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -91,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { player.sendPacket(ActionFailed.STATIC_PACKET); - PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 4d8e55bc8e..a64477703b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -90,7 +90,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning(player + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -301,7 +301,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (Exception e) { - PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _command + " " + e.getMessage()); + PacketLogger.warning("Exception processing bypass from " + player + ": " + _command + " " + e.getMessage()); if (player.isGM()) { final StringBuilder sb = new StringBuilder(200); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 5d4b260a76..90500671bf 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -69,7 +69,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to cancel not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to cancel not own post!", Config.DEFAULT_PUNISH); return; } @@ -121,19 +121,19 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items not from mail !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items not from mail !", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 1491cb1bfb..6b1a8b5d37 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -89,7 +89,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info(player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java index 6d59e89936..8685cb4867 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java @@ -77,7 +77,7 @@ public class RequestDeleteReceivedPost implements IClientIncomingPacket } if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java index 88fd8b949d..c4d3846ad7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java @@ -77,7 +77,7 @@ public class RequestDeleteSentPost implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index de4ae4af01..00484c7b33 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -129,7 +129,7 @@ public class RequestEnchantItem implements IClientIncomingPacket // fast auto-enchant cheat check if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " use autoenchant program ", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -139,7 +139,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", scroll.getObjectId(), 1, player, item) == null) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -149,7 +149,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if ((support != null) && (player.getInventory().destroyItem("Enchant", support.getObjectId(), 1, player, item) == null)) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -354,7 +354,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", item, player, null) == null) { // unable to destroy item, cheater ? - Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from player " + player.getName() + ", possible cheater !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from " + player + ", possible cheater !", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); if (Config.LOG_ITEM_ENCHANTS) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index f6b8d47c50..6630088f2a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -126,7 +126,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket default: { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } } @@ -159,7 +159,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket if (attribute.getType() == opositeElement) { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); return; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java index dc903790d0..27ced7e5f8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java @@ -45,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - PacketLogger.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning(player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); } } \ No newline at end of file diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 3831df74ef..1c68221c0d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -61,7 +61,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 7253226656..0fb3a57829 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -53,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from " + player); } player.sendPacket(ActionFailed.STATIC_PACKET); return; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 79db1768e6..044ebba720 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -51,7 +51,7 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 1c19213904..639d2105e3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -76,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " requested Henna Draw remove without any henna."); player.sendPacket(ActionFailed.STATIC_PACKET); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java index 2cdc066ead..f5713d967d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java @@ -50,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty html link!"); + PacketLogger.warning(player + " sent empty html link!"); return; } if (_link.contains("..")) { - PacketLogger.warning("Player " + player.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning(player + " sent invalid html link: link " + _link); return; } final int htmlObjectId = player.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - PacketLogger.warning("Player " + player.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning(player + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 14eb0ff29b..7570e3e5e2 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -93,7 +93,7 @@ public class RequestPackageSend implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index e1e1402fb5..c3a945d274 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -108,7 +108,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own attachment!", Config.DEFAULT_PUNISH); return; } @@ -135,19 +135,19 @@ public class RequestPostAttachment implements IClientIncomingPacket // Calculate needed slots if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } @@ -194,7 +194,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java index 2ded12e55d..f70e24e74c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java @@ -135,7 +135,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket if ((storePlayer.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL) && (storeList.getItemCount() > _items.size())) { - final String msgErr = "[RequestPrivateStoreBuy] player " + player.getName() + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; + final String msgErr = "[RequestPrivateStoreBuy] " + player + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java index 6ffcc69313..cbf78835a6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java @@ -65,7 +65,7 @@ public class RequestReceivedPost implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to receive not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to receive not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java index a150cfa85e..ed52eb784a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java @@ -131,13 +131,13 @@ public class RequestRecipeShopListSet implements IClientIncomingPacket } if (!player.hasRecipeList(recipe.getId())) { - Util.handleIllegalPlayerAction(player, "Warning!! Player " + player.getName() + " of account " + player.getAccountName() + " tried to set recipe which he dont have.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set recipe which he does not have.", Config.DEFAULT_PUNISH); return; } if (recipeCost > MAX_ADENA) { - Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to set price of " + recipeCost + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set price of " + recipeCost + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); return; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java index 55c75f0292..ac8373ebdf 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java @@ -49,7 +49,7 @@ public class RequestRecipeShopMessageSet implements IClientIncomingPacket if ((_name != null) && (_name.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java index 1a7c1ebc0f..154c1276dd 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java @@ -77,7 +77,7 @@ public class RequestRejectPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java index 1cf200da52..9f4036d402 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java @@ -64,7 +64,7 @@ public class RequestSentPost implements IClientIncomingPacket if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to read not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to read not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 04f5293545..d285ab1b5d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -134,7 +134,7 @@ public class Say2 implements IClientIncomingPacket if (Config.L2WALKER_PROTECTION && (chatType == ChatType.WHISPER) && checkBot(_text)) { - Util.handleIllegalPlayerAction(player, "Client Emulator Detect: Player " + player.getName() + " using l2walker.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Client Emulator Detect: " + player + " using L2Walker.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index db6358f368..b332fd9707 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -109,7 +109,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java index 76e8ac2a68..89261d5490 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java index d86bfc8f84..88e04641cf 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java index 2726f99c08..38de85007e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java @@ -50,7 +50,7 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket if ((_msg != null) && (_msg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java index 40f802fb2c..8aea369fbc 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java @@ -86,7 +86,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket if ((player.getAbilityPoints() == 0) || (player.getAbilityPoints() == player.getAbilityPointsUsed())) { - PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning(player + " is trying to learn ability without ability points!"); return; } @@ -156,7 +156,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 1: Learning skill without having X points spent on the specific tree if (learn.getPointsRequired() > pointsSpent[learn.getTreeId() - 1]) { - PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!"); + PacketLogger.warning(player + " is trying to learn " + skill + " without enough ability points spent!"); player.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -166,7 +166,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket { if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel()) { - PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); + PacketLogger.warning(player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); player.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -175,7 +175,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 3 Learning a skill without having enough points if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points) { - PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning(player + " is trying to learn ability without ability points!"); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index bf64e21529..7def665ec6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -67,7 +67,7 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); player.sendPacket(ExChangeAttributeFail.STATIC); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java index 7eb252c475..7842f646cd 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java @@ -61,35 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning(player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning(player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (15-day) Extension not found in inventory."); return; } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (30-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (30-day) Extension not found in inventory."); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 1b6a022140..727ebc986b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -124,12 +124,12 @@ public class RequestBRBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index 44e131c329..6eb754180a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -145,12 +145,12 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 13ef62f55f..db6c5307ee 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -61,7 +61,7 @@ public class SellListProcure implements IClientOutgoingPacket packet.writeQ(entry.getValue()); // count packet.writeH(item.getItem().getType2()); packet.writeH(0); // unknown - packet.writeQ(0); // price, u shouldnt get any adena for crops, only raw materials + packet.writeQ(0); // price, you shouldnt get any adena for crops, only raw materials } return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/Evolve.java index 51de657d97..753072b609 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/Evolve.java @@ -62,7 +62,7 @@ public class Evolve final Pet currentPet = (Pet) pet; if (currentPet.isAlikeDead()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); return false; } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java index cfbbc97cae..1a5bad379a 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java @@ -370,7 +370,7 @@ public class TalentShow extends AbstractNpcAI { if ((event == null) || event.isEmpty()) { - LOGGER.warning("MC_Show: Null/Empty event for npc " + npc + " and player " + player + "!"); + LOGGER.warning("MC_Show: Null/Empty event for " + npc + " and " + player + "!"); return null; } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index 4c24eb02bf..f1fd3813c2 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -1247,7 +1247,7 @@ public class CastleChamberlain extends AbstractNpcAI } default: { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java index 3f454fc2e0..3bbdfc4b16 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java @@ -784,12 +784,12 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader if (newClass == null) { - LOGGER.warning(getClass().getSimpleName() + ": No new classId found for player " + player); + LOGGER.warning(getClass().getSimpleName() + ": No new classId found for " + player); return false; } else if (newClass == player.getClassId()) { - LOGGER.warning(getClass().getSimpleName() + ": New classId found for player " + player + " is exactly the same as the one he currently is!"); + LOGGER.warning(getClass().getSimpleName() + ": New classId found for " + player + " is exactly the same as the one he currently is!"); return false; } else if (checkIfClassChangeHasOptions(player)) diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java index c621669129..8d38a27541 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java @@ -163,7 +163,7 @@ public class ManorManager extends AbstractNpcAI } default: { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java index 994b1e29c1..51eb102f5e 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java @@ -125,7 +125,7 @@ public class SkillTransfer extends AbstractNpcAI if (count < 0) { final String className = ClassListData.getInstance().getClass(player.getClassId()).getClassName(); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " has too many transfered skills or items, skill:" + s.getName() + " (" + sk.getId() + "/" + sk.getLevel() + "), class:" + className, IllegalActionPunishmentType.BROADCAST); + Util.handleIllegalPlayerAction(player, player + " has too many transfered skills or items, skill:" + s.getName() + " (" + sk.getId() + "/" + sk.getLevel() + "), class:" + className, IllegalActionPunishmentType.BROADCAST); if (Config.SKILL_CHECK_REMOVE) { player.removeSkill(sk); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/Link.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/Link.java index 8010bd0081..5bd82b732d 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/Link.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/Link.java @@ -99,13 +99,13 @@ public class Link implements IBypassHandler final String htmlPath = command.substring(4).trim(); if (htmlPath.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty link html!"); + LOGGER.warning(player + " sent empty link html!"); return false; } if (htmlPath.contains("..")) { - LOGGER.warning("Player " + player.getName() + " sent invalid link html: " + htmlPath); + LOGGER.warning(player + " sent invalid link html: " + htmlPath); return false; } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/communityboard/ClanBoard.java index 3bfdf86486..a205475a6c 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/communityboard/ClanBoard.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/communityboard/ClanBoard.java @@ -77,7 +77,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanList(player, 1); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan list bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan list bypass " + command + "!"); } } } @@ -97,7 +97,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanHome(player); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan home bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan home bypass " + command + "!"); } } } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java index dc54e01a0b..df4f03d172 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java @@ -83,7 +83,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for " + player); } } else if (command.startsWith("bbs_add_fav")) @@ -110,7 +110,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for " + player); } } } @@ -134,7 +134,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for " + player); } } return true; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/communityboard/HomeBoard.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/communityboard/HomeBoard.java index 86c5869161..1124c98ea4 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/communityboard/HomeBoard.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/communityboard/HomeBoard.java @@ -354,7 +354,7 @@ public class HomeBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for " + player); } return count; } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/communityboard/RegionBoard.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/communityboard/RegionBoard.java index 0c5abf5c5a..c6a4392f6a 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/communityboard/RegionBoard.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/communityboard/RegionBoard.java @@ -80,7 +80,7 @@ public class RegionBoard implements IWriteBoardHandler final String id = command.replace("_bbsloc;", ""); if (!Util.isDigit(id)) { - LOG.warning(RegionBoard.class.getSimpleName() + ": Player " + player + " sent and invalid region bypass " + command + "!"); + LOG.warning(RegionBoard.class.getSimpleName() + ": " + player + " sent and invalid region bypass " + command + "!"); return false; } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/AbstractInstance.java index 06415e9d40..94c337f0df 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/AbstractInstance.java @@ -124,7 +124,7 @@ public abstract class AbstractInstance extends AbstractNpcAI final InstanceTemplate template = manager.getInstanceTemplate(templateId); if (template == null) { - LOGGER.warning("Player " + player.getName() + " (" + player.getObjectId() + ") wants to create instance with unknown template id " + templateId + "!"); + LOGGER.warning(player + " wants to create instance with unknown template id " + templateId + "!"); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 73914d140e..e288979088 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -278,7 +278,7 @@ public class MultisellData implements IXmlReader } else { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); return; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index 34c26f1ed0..c9bd4ec11e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -99,7 +99,7 @@ public class AdminCommandHandler implements IHandler 0) { @@ -6660,7 +6660,7 @@ public class Player extends Playable // a possible restart-while-modifysubclass cheat has been attempted. // Switching to use base class player.setClassId(player.getBaseClass()); - LOGGER.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); + LOGGER.warning(player + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); } else { @@ -12887,12 +12887,12 @@ public class Player extends Playable if (nextLevel == -1) { - LOGGER.info("Removing skill " + skill + " from player " + toString()); + LOGGER.info("Removing skill " + skill + " from " + this); removeSkill(skill, true); // there is no lower skill } else { - LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString()); + LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for " + this); addSkill(SkillData.getInstance().getSkill(skill.getId(), nextLevel), true); // replace with lower one } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java index 4c57311215..4b336a420e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java @@ -108,7 +108,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -120,7 +120,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -131,7 +131,7 @@ public class Teleporter extends Npc // Check for required count of params. if (st.countTokens() != 2) { - LOGGER.warning("Player " + player.getObjectId() + " send unhandled teleport command: " + command); + LOGGER.warning(player + " send unhandled teleport command: " + command); return; } @@ -139,7 +139,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); + LOGGER.warning(player + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); return; } holder.doTeleport(player, this, parseNextInt(st, -1)); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/quest/Quest.java index 1b721b08bd..f0e49e65e4 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -1589,7 +1589,7 @@ public class Quest extends AbstractScript implements IIdentifiable final Quest q = QuestManager.getInstance().getQuest(questId); if (q == null) { - LOGGER.finer("Unknown quest " + questId + " for player " + player.getName()); + LOGGER.finer("Unknown quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestData.setInt(1, player.getObjectId()); @@ -1620,7 +1620,7 @@ public class Quest extends AbstractScript implements IIdentifiable final QuestState qs = player.getQuestState(questId); if (qs == null) { - LOGGER.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); + LOGGER.finer("Lost variable " + var + " in quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestDataVar.setInt(1, player.getObjectId()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index 59a7a0e0bb..56a0436a24 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -135,7 +135,7 @@ public class TeleportHolder { if (isNoblesse() && (player.getNobleLevel() < 1)) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } @@ -194,14 +194,14 @@ public class TeleportHolder { if (isNoblesse() && (player.getNobleLevel() < 1)) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } final TeleportLocation loc = getLocation(locId); if (loc == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport location " + locId + " within list " + _name + "!"); + LOGGER.warning(player + " requested unknown teleport location " + locId + " within list " + _name + "!"); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index 59d0be8196..8e329ec039 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -119,7 +119,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": " + player + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -136,7 +136,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { // The previous level skill has not been learned. player.sendPacket(SystemMessageId.THE_PREVIOUS_LEVEL_SKILL_HAS_NOT_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } } @@ -163,7 +163,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!canTransform(player)) { player.sendPacket(SystemMessageId.YOU_HAVE_NOT_COMPLETED_THE_NECESSARY_QUEST_FOR_SKILL_ACQUISITION); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); return; } @@ -198,7 +198,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!clan.isLearnableSubPledgeSkill(skill, _subType)) { player.sendPacket(SystemMessageId.THIS_SQUAD_SKILL_HAS_ALREADY_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } @@ -260,7 +260,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -290,7 +290,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -353,13 +353,13 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } if ((player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); return; } @@ -375,7 +375,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (count >= 2) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); return; } @@ -404,14 +404,14 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive() && !player.isDualClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } if ((player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); return; } @@ -427,7 +427,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (count >= 2) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); return; } @@ -513,7 +513,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (skillLearn.getGetLevel() > player.getLevel()) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_SKILL_LEVEL_REQUIREMENTS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); return false; } @@ -582,7 +582,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { if (!player.destroyItemByItemId("SkillLearn", itemIdCount.getId(), itemIdCount.getCount(), trainer, true)) { - Util.handleIllegalPlayerAction(player, "Somehow player " + player.getName() + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, "Somehow " + player + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); } } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index 6ac4cc7ca0..0b8b67f9a0 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -91,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { player.sendPacket(ActionFailed.STATIC_PACKET); - PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 4d8e55bc8e..a64477703b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -90,7 +90,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning(player + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -301,7 +301,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (Exception e) { - PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _command + " " + e.getMessage()); + PacketLogger.warning("Exception processing bypass from " + player + ": " + _command + " " + e.getMessage()); if (player.isGM()) { final StringBuilder sb = new StringBuilder(200); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index e8d7efa6b0..afec030dc7 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -69,7 +69,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to cancel not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to cancel not own post!", Config.DEFAULT_PUNISH); return; } @@ -121,19 +121,19 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items not from mail !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items not from mail !", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index d76760750a..465807cb96 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -89,7 +89,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info(player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java index 6d59e89936..8685cb4867 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java @@ -77,7 +77,7 @@ public class RequestDeleteReceivedPost implements IClientIncomingPacket } if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java index 88fd8b949d..c4d3846ad7 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java @@ -77,7 +77,7 @@ public class RequestDeleteSentPost implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 1d3c5ea79d..3dd8958a1d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -129,7 +129,7 @@ public class RequestEnchantItem implements IClientIncomingPacket // fast auto-enchant cheat check if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " use autoenchant program ", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -139,7 +139,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", scroll.getObjectId(), 1, player, item) == null) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -149,7 +149,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if ((support != null) && (player.getInventory().destroyItem("Enchant", support.getObjectId(), 1, player, item) == null)) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -354,7 +354,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", item, player, null) == null) { // unable to destroy item, cheater ? - Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from player " + player.getName() + ", possible cheater !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from " + player + ", possible cheater !", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); if (Config.LOG_ITEM_ENCHANTS) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index f027b3584a..300be9e640 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -134,7 +134,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket default: { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } } @@ -167,7 +167,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket if (attribute.getType() == opositeElement) { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); return; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java index dc903790d0..27ced7e5f8 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java @@ -45,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - PacketLogger.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning(player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); } } \ No newline at end of file diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 3831df74ef..1c68221c0d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -61,7 +61,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 7253226656..0fb3a57829 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -53,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from " + player); } player.sendPacket(ActionFailed.STATIC_PACKET); return; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 79db1768e6..044ebba720 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -51,7 +51,7 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 1c19213904..639d2105e3 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -76,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " requested Henna Draw remove without any henna."); player.sendPacket(ActionFailed.STATIC_PACKET); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java index 2cdc066ead..f5713d967d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java @@ -50,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty html link!"); + PacketLogger.warning(player + " sent empty html link!"); return; } if (_link.contains("..")) { - PacketLogger.warning("Player " + player.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning(player + " sent invalid html link: link " + _link); return; } final int htmlObjectId = player.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - PacketLogger.warning("Player " + player.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning(player + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 2cd9c6a8d1..62b2ef4c5a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -93,7 +93,7 @@ public class RequestPackageSend implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 0d49ebb0f5..57db48ddb4 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -108,7 +108,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own attachment!", Config.DEFAULT_PUNISH); return; } @@ -135,19 +135,19 @@ public class RequestPostAttachment implements IClientIncomingPacket // Calculate needed slots if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } @@ -194,7 +194,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java index 2ded12e55d..f70e24e74c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java @@ -135,7 +135,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket if ((storePlayer.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL) && (storeList.getItemCount() > _items.size())) { - final String msgErr = "[RequestPrivateStoreBuy] player " + player.getName() + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; + final String msgErr = "[RequestPrivateStoreBuy] " + player + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java index 6ffcc69313..cbf78835a6 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java @@ -65,7 +65,7 @@ public class RequestReceivedPost implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to receive not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to receive not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java index a150cfa85e..ed52eb784a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java @@ -131,13 +131,13 @@ public class RequestRecipeShopListSet implements IClientIncomingPacket } if (!player.hasRecipeList(recipe.getId())) { - Util.handleIllegalPlayerAction(player, "Warning!! Player " + player.getName() + " of account " + player.getAccountName() + " tried to set recipe which he dont have.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set recipe which he does not have.", Config.DEFAULT_PUNISH); return; } if (recipeCost > MAX_ADENA) { - Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to set price of " + recipeCost + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set price of " + recipeCost + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); return; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java index 55c75f0292..ac8373ebdf 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java @@ -49,7 +49,7 @@ public class RequestRecipeShopMessageSet implements IClientIncomingPacket if ((_name != null) && (_name.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java index 1a7c1ebc0f..154c1276dd 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java @@ -77,7 +77,7 @@ public class RequestRejectPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java index 1cf200da52..9f4036d402 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java @@ -64,7 +64,7 @@ public class RequestSentPost implements IClientIncomingPacket if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to read not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to read not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index eef80fb9e2..cf6387367b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -134,7 +134,7 @@ public class Say2 implements IClientIncomingPacket if (Config.L2WALKER_PROTECTION && (chatType == ChatType.WHISPER) && checkBot(_text)) { - Util.handleIllegalPlayerAction(player, "Client Emulator Detect: Player " + player.getName() + " using l2walker.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Client Emulator Detect: " + player + " using L2Walker.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 13ecd08a96..1c02a4a421 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -109,7 +109,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java index 76e8ac2a68..89261d5490 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java index d86bfc8f84..88e04641cf 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java index 2726f99c08..38de85007e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java @@ -50,7 +50,7 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket if ((_msg != null) && (_msg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java index 40f802fb2c..8aea369fbc 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java @@ -86,7 +86,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket if ((player.getAbilityPoints() == 0) || (player.getAbilityPoints() == player.getAbilityPointsUsed())) { - PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning(player + " is trying to learn ability without ability points!"); return; } @@ -156,7 +156,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 1: Learning skill without having X points spent on the specific tree if (learn.getPointsRequired() > pointsSpent[learn.getTreeId() - 1]) { - PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!"); + PacketLogger.warning(player + " is trying to learn " + skill + " without enough ability points spent!"); player.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -166,7 +166,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket { if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel()) { - PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); + PacketLogger.warning(player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); player.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -175,7 +175,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 3 Learning a skill without having enough points if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points) { - PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning(player + " is trying to learn ability without ability points!"); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index bf64e21529..7def665ec6 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -67,7 +67,7 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); player.sendPacket(ExChangeAttributeFail.STATIC); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java index 7eb252c475..7842f646cd 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java @@ -61,35 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning(player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning(player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (15-day) Extension not found in inventory."); return; } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (30-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (30-day) Extension not found in inventory."); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 1b6a022140..727ebc986b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -124,12 +124,12 @@ public class RequestBRBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index 44e131c329..6eb754180a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -145,12 +145,12 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 13ef62f55f..db6c5307ee 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -61,7 +61,7 @@ public class SellListProcure implements IClientOutgoingPacket packet.writeQ(entry.getValue()); // count packet.writeH(item.getItem().getType2()); packet.writeH(0); // unknown - packet.writeQ(0); // price, u shouldnt get any adena for crops, only raw materials + packet.writeQ(0); // price, you shouldnt get any adena for crops, only raw materials } return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/Evolve.java index 51de657d97..753072b609 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/Evolve.java @@ -62,7 +62,7 @@ public class Evolve final Pet currentPet = (Pet) pet; if (currentPet.isAlikeDead()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); return false; } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java index cfbbc97cae..1a5bad379a 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java @@ -370,7 +370,7 @@ public class TalentShow extends AbstractNpcAI { if ((event == null) || event.isEmpty()) { - LOGGER.warning("MC_Show: Null/Empty event for npc " + npc + " and player " + player + "!"); + LOGGER.warning("MC_Show: Null/Empty event for " + npc + " and " + player + "!"); return null; } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index 4c24eb02bf..f1fd3813c2 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -1247,7 +1247,7 @@ public class CastleChamberlain extends AbstractNpcAI } default: { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java index 3f454fc2e0..3bbdfc4b16 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java @@ -784,12 +784,12 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader if (newClass == null) { - LOGGER.warning(getClass().getSimpleName() + ": No new classId found for player " + player); + LOGGER.warning(getClass().getSimpleName() + ": No new classId found for " + player); return false; } else if (newClass == player.getClassId()) { - LOGGER.warning(getClass().getSimpleName() + ": New classId found for player " + player + " is exactly the same as the one he currently is!"); + LOGGER.warning(getClass().getSimpleName() + ": New classId found for " + player + " is exactly the same as the one he currently is!"); return false; } else if (checkIfClassChangeHasOptions(player)) diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java index c621669129..8d38a27541 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java @@ -163,7 +163,7 @@ public class ManorManager extends AbstractNpcAI } default: { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java index 994b1e29c1..51eb102f5e 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java @@ -125,7 +125,7 @@ public class SkillTransfer extends AbstractNpcAI if (count < 0) { final String className = ClassListData.getInstance().getClass(player.getClassId()).getClassName(); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " has too many transfered skills or items, skill:" + s.getName() + " (" + sk.getId() + "/" + sk.getLevel() + "), class:" + className, IllegalActionPunishmentType.BROADCAST); + Util.handleIllegalPlayerAction(player, player + " has too many transfered skills or items, skill:" + s.getName() + " (" + sk.getId() + "/" + sk.getLevel() + "), class:" + className, IllegalActionPunishmentType.BROADCAST); if (Config.SKILL_CHECK_REMOVE) { player.removeSkill(sk); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/Link.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/Link.java index 8010bd0081..5bd82b732d 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/Link.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/Link.java @@ -99,13 +99,13 @@ public class Link implements IBypassHandler final String htmlPath = command.substring(4).trim(); if (htmlPath.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty link html!"); + LOGGER.warning(player + " sent empty link html!"); return false; } if (htmlPath.contains("..")) { - LOGGER.warning("Player " + player.getName() + " sent invalid link html: " + htmlPath); + LOGGER.warning(player + " sent invalid link html: " + htmlPath); return false; } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/communityboard/ClanBoard.java index 3bfdf86486..a205475a6c 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/communityboard/ClanBoard.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/communityboard/ClanBoard.java @@ -77,7 +77,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanList(player, 1); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan list bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan list bypass " + command + "!"); } } } @@ -97,7 +97,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanHome(player); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan home bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan home bypass " + command + "!"); } } } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java index dc54e01a0b..df4f03d172 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java @@ -83,7 +83,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for " + player); } } else if (command.startsWith("bbs_add_fav")) @@ -110,7 +110,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for " + player); } } } @@ -134,7 +134,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for " + player); } } return true; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/communityboard/HomeBoard.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/communityboard/HomeBoard.java index 86c5869161..1124c98ea4 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/communityboard/HomeBoard.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/communityboard/HomeBoard.java @@ -354,7 +354,7 @@ public class HomeBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for " + player); } return count; } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/communityboard/RegionBoard.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/communityboard/RegionBoard.java index 0c5abf5c5a..c6a4392f6a 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/communityboard/RegionBoard.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/communityboard/RegionBoard.java @@ -80,7 +80,7 @@ public class RegionBoard implements IWriteBoardHandler final String id = command.replace("_bbsloc;", ""); if (!Util.isDigit(id)) { - LOG.warning(RegionBoard.class.getSimpleName() + ": Player " + player + " sent and invalid region bypass " + command + "!"); + LOG.warning(RegionBoard.class.getSimpleName() + ": " + player + " sent and invalid region bypass " + command + "!"); return false; } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/AbstractInstance.java index 06415e9d40..94c337f0df 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/AbstractInstance.java @@ -124,7 +124,7 @@ public abstract class AbstractInstance extends AbstractNpcAI final InstanceTemplate template = manager.getInstanceTemplate(templateId); if (template == null) { - LOGGER.warning("Player " + player.getName() + " (" + player.getObjectId() + ") wants to create instance with unknown template id " + templateId + "!"); + LOGGER.warning(player + " wants to create instance with unknown template id " + templateId + "!"); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 73914d140e..e288979088 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -278,7 +278,7 @@ public class MultisellData implements IXmlReader } else { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); return; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index 34c26f1ed0..c9bd4ec11e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -99,7 +99,7 @@ public class AdminCommandHandler implements IHandler 0) { @@ -6660,7 +6660,7 @@ public class Player extends Playable // a possible restart-while-modifysubclass cheat has been attempted. // Switching to use base class player.setClassId(player.getBaseClass()); - LOGGER.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); + LOGGER.warning(player + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); } else { @@ -12890,12 +12890,12 @@ public class Player extends Playable if (nextLevel == -1) { - LOGGER.info("Removing skill " + skill + " from player " + toString()); + LOGGER.info("Removing skill " + skill + " from " + this); removeSkill(skill, true); // there is no lower skill } else { - LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString()); + LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for " + this); addSkill(SkillData.getInstance().getSkill(skill.getId(), nextLevel), true); // replace with lower one } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java index 4c57311215..4b336a420e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java @@ -108,7 +108,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -120,7 +120,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -131,7 +131,7 @@ public class Teleporter extends Npc // Check for required count of params. if (st.countTokens() != 2) { - LOGGER.warning("Player " + player.getObjectId() + " send unhandled teleport command: " + command); + LOGGER.warning(player + " send unhandled teleport command: " + command); return; } @@ -139,7 +139,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); + LOGGER.warning(player + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); return; } holder.doTeleport(player, this, parseNextInt(st, -1)); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/Quest.java index 297e2f9e38..70b756f735 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -1589,7 +1589,7 @@ public class Quest extends AbstractScript implements IIdentifiable final Quest q = QuestManager.getInstance().getQuest(questId); if (q == null) { - LOGGER.finer("Unknown quest " + questId + " for player " + player.getName()); + LOGGER.finer("Unknown quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestData.setInt(1, player.getObjectId()); @@ -1620,7 +1620,7 @@ public class Quest extends AbstractScript implements IIdentifiable final QuestState qs = player.getQuestState(questId); if (qs == null) { - LOGGER.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); + LOGGER.finer("Lost variable " + var + " in quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestDataVar.setInt(1, player.getObjectId()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index 59a7a0e0bb..56a0436a24 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -135,7 +135,7 @@ public class TeleportHolder { if (isNoblesse() && (player.getNobleLevel() < 1)) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } @@ -194,14 +194,14 @@ public class TeleportHolder { if (isNoblesse() && (player.getNobleLevel() < 1)) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } final TeleportLocation loc = getLocation(locId); if (loc == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport location " + locId + " within list " + _name + "!"); + LOGGER.warning(player + " requested unknown teleport location " + locId + " within list " + _name + "!"); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index 90f86dff97..dff4cb79d7 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -119,7 +119,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": " + player + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -136,7 +136,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { // The previous level skill has not been learned. player.sendPacket(SystemMessageId.THE_PREVIOUS_LEVEL_SKILL_HAS_NOT_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } } @@ -163,7 +163,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!canTransform(player)) { player.sendPacket(SystemMessageId.YOU_HAVE_NOT_COMPLETED_THE_NECESSARY_QUEST_FOR_SKILL_ACQUISITION); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); return; } @@ -198,7 +198,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!clan.isLearnableSubPledgeSkill(skill, _subType)) { player.sendPacket(SystemMessageId.THIS_SQUAD_SKILL_HAS_ALREADY_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } @@ -260,7 +260,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -290,7 +290,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -353,13 +353,13 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } if ((player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); return; } @@ -375,7 +375,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (count >= 2) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); return; } @@ -404,14 +404,14 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive() && !player.isDualClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } if ((player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); return; } @@ -427,7 +427,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (count >= 2) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); return; } @@ -513,7 +513,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (skillLearn.getGetLevel() > player.getLevel()) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_SKILL_LEVEL_REQUIREMENTS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); return false; } @@ -582,7 +582,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { if (!player.destroyItemByItemId("SkillLearn", itemIdCount.getId(), itemIdCount.getCount(), trainer, true)) { - Util.handleIllegalPlayerAction(player, "Somehow player " + player.getName() + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, "Somehow " + player + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); } } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index 6ac4cc7ca0..0b8b67f9a0 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -91,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { player.sendPacket(ActionFailed.STATIC_PACKET); - PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 4d8e55bc8e..a64477703b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -90,7 +90,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning(player + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -301,7 +301,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (Exception e) { - PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _command + " " + e.getMessage()); + PacketLogger.warning("Exception processing bypass from " + player + ": " + _command + " " + e.getMessage()); if (player.isGM()) { final StringBuilder sb = new StringBuilder(200); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index e8d7efa6b0..afec030dc7 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -69,7 +69,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to cancel not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to cancel not own post!", Config.DEFAULT_PUNISH); return; } @@ -121,19 +121,19 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items not from mail !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items not from mail !", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index d76760750a..465807cb96 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -89,7 +89,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info(player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java index 6d59e89936..8685cb4867 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java @@ -77,7 +77,7 @@ public class RequestDeleteReceivedPost implements IClientIncomingPacket } if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java index 88fd8b949d..c4d3846ad7 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java @@ -77,7 +77,7 @@ public class RequestDeleteSentPost implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 1d3c5ea79d..3dd8958a1d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -129,7 +129,7 @@ public class RequestEnchantItem implements IClientIncomingPacket // fast auto-enchant cheat check if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " use autoenchant program ", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -139,7 +139,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", scroll.getObjectId(), 1, player, item) == null) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -149,7 +149,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if ((support != null) && (player.getInventory().destroyItem("Enchant", support.getObjectId(), 1, player, item) == null)) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -354,7 +354,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", item, player, null) == null) { // unable to destroy item, cheater ? - Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from player " + player.getName() + ", possible cheater !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from " + player + ", possible cheater !", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); if (Config.LOG_ITEM_ENCHANTS) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index f027b3584a..300be9e640 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -134,7 +134,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket default: { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } } @@ -167,7 +167,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket if (attribute.getType() == opositeElement) { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); return; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java index dc903790d0..27ced7e5f8 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java @@ -45,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - PacketLogger.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning(player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); } } \ No newline at end of file diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 3831df74ef..1c68221c0d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -61,7 +61,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 7253226656..0fb3a57829 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -53,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from " + player); } player.sendPacket(ActionFailed.STATIC_PACKET); return; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 79db1768e6..044ebba720 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -51,7 +51,7 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 1c19213904..639d2105e3 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -76,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " requested Henna Draw remove without any henna."); player.sendPacket(ActionFailed.STATIC_PACKET); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java index 2cdc066ead..f5713d967d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java @@ -50,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty html link!"); + PacketLogger.warning(player + " sent empty html link!"); return; } if (_link.contains("..")) { - PacketLogger.warning("Player " + player.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning(player + " sent invalid html link: link " + _link); return; } final int htmlObjectId = player.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - PacketLogger.warning("Player " + player.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning(player + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 2cd9c6a8d1..62b2ef4c5a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -93,7 +93,7 @@ public class RequestPackageSend implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 0d49ebb0f5..57db48ddb4 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -108,7 +108,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own attachment!", Config.DEFAULT_PUNISH); return; } @@ -135,19 +135,19 @@ public class RequestPostAttachment implements IClientIncomingPacket // Calculate needed slots if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } @@ -194,7 +194,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java index 2ded12e55d..f70e24e74c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java @@ -135,7 +135,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket if ((storePlayer.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL) && (storeList.getItemCount() > _items.size())) { - final String msgErr = "[RequestPrivateStoreBuy] player " + player.getName() + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; + final String msgErr = "[RequestPrivateStoreBuy] " + player + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java index 6ffcc69313..cbf78835a6 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java @@ -65,7 +65,7 @@ public class RequestReceivedPost implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to receive not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to receive not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java index a150cfa85e..ed52eb784a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java @@ -131,13 +131,13 @@ public class RequestRecipeShopListSet implements IClientIncomingPacket } if (!player.hasRecipeList(recipe.getId())) { - Util.handleIllegalPlayerAction(player, "Warning!! Player " + player.getName() + " of account " + player.getAccountName() + " tried to set recipe which he dont have.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set recipe which he does not have.", Config.DEFAULT_PUNISH); return; } if (recipeCost > MAX_ADENA) { - Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to set price of " + recipeCost + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set price of " + recipeCost + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); return; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java index 55c75f0292..ac8373ebdf 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java @@ -49,7 +49,7 @@ public class RequestRecipeShopMessageSet implements IClientIncomingPacket if ((_name != null) && (_name.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java index 1a7c1ebc0f..154c1276dd 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java @@ -77,7 +77,7 @@ public class RequestRejectPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java index 1cf200da52..9f4036d402 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java @@ -64,7 +64,7 @@ public class RequestSentPost implements IClientIncomingPacket if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to read not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to read not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 04f5293545..d285ab1b5d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -134,7 +134,7 @@ public class Say2 implements IClientIncomingPacket if (Config.L2WALKER_PROTECTION && (chatType == ChatType.WHISPER) && checkBot(_text)) { - Util.handleIllegalPlayerAction(player, "Client Emulator Detect: Player " + player.getName() + " using l2walker.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Client Emulator Detect: " + player + " using L2Walker.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 13ecd08a96..1c02a4a421 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -109,7 +109,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java index 76e8ac2a68..89261d5490 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java index d86bfc8f84..88e04641cf 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java index 2726f99c08..38de85007e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java @@ -50,7 +50,7 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket if ((_msg != null) && (_msg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java index 40f802fb2c..8aea369fbc 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java @@ -86,7 +86,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket if ((player.getAbilityPoints() == 0) || (player.getAbilityPoints() == player.getAbilityPointsUsed())) { - PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning(player + " is trying to learn ability without ability points!"); return; } @@ -156,7 +156,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 1: Learning skill without having X points spent on the specific tree if (learn.getPointsRequired() > pointsSpent[learn.getTreeId() - 1]) { - PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!"); + PacketLogger.warning(player + " is trying to learn " + skill + " without enough ability points spent!"); player.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -166,7 +166,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket { if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel()) { - PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); + PacketLogger.warning(player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); player.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -175,7 +175,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 3 Learning a skill without having enough points if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points) { - PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning(player + " is trying to learn ability without ability points!"); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index bf64e21529..7def665ec6 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -67,7 +67,7 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); player.sendPacket(ExChangeAttributeFail.STATIC); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java index 7eb252c475..7842f646cd 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java @@ -61,35 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning(player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning(player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (15-day) Extension not found in inventory."); return; } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (30-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (30-day) Extension not found in inventory."); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 1b6a022140..727ebc986b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -124,12 +124,12 @@ public class RequestBRBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index 44e131c329..6eb754180a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -145,12 +145,12 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 13ef62f55f..db6c5307ee 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -61,7 +61,7 @@ public class SellListProcure implements IClientOutgoingPacket packet.writeQ(entry.getValue()); // count packet.writeH(item.getItem().getType2()); packet.writeH(0); // unknown - packet.writeQ(0); // price, u shouldnt get any adena for crops, only raw materials + packet.writeQ(0); // price, you shouldnt get any adena for crops, only raw materials } return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/Evolve.java index 51de657d97..753072b609 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/Evolve.java @@ -62,7 +62,7 @@ public class Evolve final Pet currentPet = (Pet) pet; if (currentPet.isAlikeDead()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); return false; } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java index cfbbc97cae..1a5bad379a 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java @@ -370,7 +370,7 @@ public class TalentShow extends AbstractNpcAI { if ((event == null) || event.isEmpty()) { - LOGGER.warning("MC_Show: Null/Empty event for npc " + npc + " and player " + player + "!"); + LOGGER.warning("MC_Show: Null/Empty event for " + npc + " and " + player + "!"); return null; } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index 4c24eb02bf..f1fd3813c2 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -1247,7 +1247,7 @@ public class CastleChamberlain extends AbstractNpcAI } default: { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java index 246e84aea3..6a74152b07 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java @@ -784,12 +784,12 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader if (newClass == null) { - LOGGER.warning(getClass().getSimpleName() + ": No new classId found for player " + player); + LOGGER.warning(getClass().getSimpleName() + ": No new classId found for " + player); return false; } else if (newClass == player.getClassId()) { - LOGGER.warning(getClass().getSimpleName() + ": New classId found for player " + player + " is exactly the same as the one he currently is!"); + LOGGER.warning(getClass().getSimpleName() + ": New classId found for " + player + " is exactly the same as the one he currently is!"); return false; } else if (checkIfClassChangeHasOptions(player)) diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java index c621669129..8d38a27541 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java @@ -163,7 +163,7 @@ public class ManorManager extends AbstractNpcAI } default: { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java index 994b1e29c1..51eb102f5e 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java @@ -125,7 +125,7 @@ public class SkillTransfer extends AbstractNpcAI if (count < 0) { final String className = ClassListData.getInstance().getClass(player.getClassId()).getClassName(); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " has too many transfered skills or items, skill:" + s.getName() + " (" + sk.getId() + "/" + sk.getLevel() + "), class:" + className, IllegalActionPunishmentType.BROADCAST); + Util.handleIllegalPlayerAction(player, player + " has too many transfered skills or items, skill:" + s.getName() + " (" + sk.getId() + "/" + sk.getLevel() + "), class:" + className, IllegalActionPunishmentType.BROADCAST); if (Config.SKILL_CHECK_REMOVE) { player.removeSkill(sk); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/Link.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/Link.java index 8010bd0081..5bd82b732d 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/Link.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/Link.java @@ -99,13 +99,13 @@ public class Link implements IBypassHandler final String htmlPath = command.substring(4).trim(); if (htmlPath.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty link html!"); + LOGGER.warning(player + " sent empty link html!"); return false; } if (htmlPath.contains("..")) { - LOGGER.warning("Player " + player.getName() + " sent invalid link html: " + htmlPath); + LOGGER.warning(player + " sent invalid link html: " + htmlPath); return false; } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/communityboard/ClanBoard.java index 3bfdf86486..a205475a6c 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/communityboard/ClanBoard.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/communityboard/ClanBoard.java @@ -77,7 +77,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanList(player, 1); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan list bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan list bypass " + command + "!"); } } } @@ -97,7 +97,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanHome(player); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan home bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan home bypass " + command + "!"); } } } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java index dc54e01a0b..df4f03d172 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java @@ -83,7 +83,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for " + player); } } else if (command.startsWith("bbs_add_fav")) @@ -110,7 +110,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for " + player); } } } @@ -134,7 +134,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for " + player); } } return true; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/communityboard/HomeBoard.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/communityboard/HomeBoard.java index 86c5869161..1124c98ea4 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/communityboard/HomeBoard.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/communityboard/HomeBoard.java @@ -354,7 +354,7 @@ public class HomeBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for " + player); } return count; } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/communityboard/RegionBoard.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/communityboard/RegionBoard.java index 0c5abf5c5a..c6a4392f6a 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/communityboard/RegionBoard.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/communityboard/RegionBoard.java @@ -80,7 +80,7 @@ public class RegionBoard implements IWriteBoardHandler final String id = command.replace("_bbsloc;", ""); if (!Util.isDigit(id)) { - LOG.warning(RegionBoard.class.getSimpleName() + ": Player " + player + " sent and invalid region bypass " + command + "!"); + LOG.warning(RegionBoard.class.getSimpleName() + ": " + player + " sent and invalid region bypass " + command + "!"); return false; } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/AbstractInstance.java index cf33680b4e..973aff5e7b 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/AbstractInstance.java @@ -124,7 +124,7 @@ public abstract class AbstractInstance extends AbstractNpcAI final InstanceTemplate template = manager.getInstanceTemplate(templateId); if (template == null) { - LOGGER.warning("Player " + player.getName() + " (" + player.getObjectId() + ") wants to create instance with unknown template id " + templateId + "!"); + LOGGER.warning(player + " wants to create instance with unknown template id " + templateId + "!"); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 73914d140e..e288979088 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -278,7 +278,7 @@ public class MultisellData implements IXmlReader } else { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); return; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index 34c26f1ed0..c9bd4ec11e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -99,7 +99,7 @@ public class AdminCommandHandler implements IHandler 0) { @@ -6661,7 +6661,7 @@ public class Player extends Playable // a possible restart-while-modifysubclass cheat has been attempted. // Switching to use base class player.setClassId(player.getBaseClass()); - LOGGER.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); + LOGGER.warning(player + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); } else { @@ -12896,12 +12896,12 @@ public class Player extends Playable if (nextLevel == -1) { - LOGGER.info("Removing skill " + skill + " from player " + toString()); + LOGGER.info("Removing skill " + skill + " from " + this); removeSkill(skill, true); // there is no lower skill } else { - LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString()); + LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for " + this); addSkill(SkillData.getInstance().getSkill(skill.getId(), nextLevel), true); // replace with lower one } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java index 4c57311215..4b336a420e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java @@ -108,7 +108,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -120,7 +120,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -131,7 +131,7 @@ public class Teleporter extends Npc // Check for required count of params. if (st.countTokens() != 2) { - LOGGER.warning("Player " + player.getObjectId() + " send unhandled teleport command: " + command); + LOGGER.warning(player + " send unhandled teleport command: " + command); return; } @@ -139,7 +139,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); + LOGGER.warning(player + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); return; } holder.doTeleport(player, this, parseNextInt(st, -1)); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/Quest.java index 297e2f9e38..70b756f735 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -1589,7 +1589,7 @@ public class Quest extends AbstractScript implements IIdentifiable final Quest q = QuestManager.getInstance().getQuest(questId); if (q == null) { - LOGGER.finer("Unknown quest " + questId + " for player " + player.getName()); + LOGGER.finer("Unknown quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestData.setInt(1, player.getObjectId()); @@ -1620,7 +1620,7 @@ public class Quest extends AbstractScript implements IIdentifiable final QuestState qs = player.getQuestState(questId); if (qs == null) { - LOGGER.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); + LOGGER.finer("Lost variable " + var + " in quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestDataVar.setInt(1, player.getObjectId()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index 59a7a0e0bb..56a0436a24 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -135,7 +135,7 @@ public class TeleportHolder { if (isNoblesse() && (player.getNobleLevel() < 1)) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } @@ -194,14 +194,14 @@ public class TeleportHolder { if (isNoblesse() && (player.getNobleLevel() < 1)) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } final TeleportLocation loc = getLocation(locId); if (loc == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport location " + locId + " within list " + _name + "!"); + LOGGER.warning(player + " requested unknown teleport location " + locId + " within list " + _name + "!"); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index 90f86dff97..dff4cb79d7 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -119,7 +119,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": " + player + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -136,7 +136,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { // The previous level skill has not been learned. player.sendPacket(SystemMessageId.THE_PREVIOUS_LEVEL_SKILL_HAS_NOT_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } } @@ -163,7 +163,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!canTransform(player)) { player.sendPacket(SystemMessageId.YOU_HAVE_NOT_COMPLETED_THE_NECESSARY_QUEST_FOR_SKILL_ACQUISITION); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); return; } @@ -198,7 +198,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!clan.isLearnableSubPledgeSkill(skill, _subType)) { player.sendPacket(SystemMessageId.THIS_SQUAD_SKILL_HAS_ALREADY_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } @@ -260,7 +260,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -290,7 +290,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -353,13 +353,13 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } if ((player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); return; } @@ -375,7 +375,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (count >= 2) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); return; } @@ -404,14 +404,14 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive() && !player.isDualClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } if ((player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); return; } @@ -427,7 +427,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (count >= 2) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_NECESSARY_MATERIALS_OR_PREREQUISITES_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); return; } @@ -513,7 +513,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (skillLearn.getGetLevel() > player.getLevel()) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_SKILL_LEVEL_REQUIREMENTS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); return false; } @@ -582,7 +582,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { if (!player.destroyItemByItemId("SkillLearn", itemIdCount.getId(), itemIdCount.getCount(), trainer, true)) { - Util.handleIllegalPlayerAction(player, "Somehow player " + player.getName() + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, "Somehow " + player + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); } } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index 6ac4cc7ca0..0b8b67f9a0 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -91,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { player.sendPacket(ActionFailed.STATIC_PACKET); - PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 4d8e55bc8e..a64477703b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -90,7 +90,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning(player + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -301,7 +301,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (Exception e) { - PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _command + " " + e.getMessage()); + PacketLogger.warning("Exception processing bypass from " + player + ": " + _command + " " + e.getMessage()); if (player.isGM()) { final StringBuilder sb = new StringBuilder(200); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index e8d7efa6b0..afec030dc7 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -69,7 +69,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to cancel not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to cancel not own post!", Config.DEFAULT_PUNISH); return; } @@ -121,19 +121,19 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items not from mail !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items not from mail !", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index d76760750a..465807cb96 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -89,7 +89,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info(player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java index 6d59e89936..8685cb4867 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java @@ -77,7 +77,7 @@ public class RequestDeleteReceivedPost implements IClientIncomingPacket } if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java index 88fd8b949d..c4d3846ad7 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java @@ -77,7 +77,7 @@ public class RequestDeleteSentPost implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 8cd6508e6f..e1596fa4bb 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -131,7 +131,7 @@ public class RequestEnchantItem implements IClientIncomingPacket // fast auto-enchant cheat check if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " use autoenchant program ", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -141,7 +141,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", scroll.getObjectId(), 1, player, item) == null) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -151,7 +151,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if ((support != null) && (player.getInventory().destroyItem("Enchant", support.getObjectId(), 1, player, item) == null)) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -356,7 +356,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", item, player, null) == null) { // unable to destroy item, cheater ? - Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from player " + player.getName() + ", possible cheater !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from " + player + ", possible cheater !", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); if (Config.LOG_ITEM_ENCHANTS) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index b7e61d2f18..122e63d6e3 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -134,7 +134,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket default: { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } } @@ -167,7 +167,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket if (attribute.getType() == opositeElement) { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); return; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java index dc903790d0..27ced7e5f8 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java @@ -45,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - PacketLogger.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning(player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); } } \ No newline at end of file diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 3831df74ef..1c68221c0d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -61,7 +61,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 7253226656..0fb3a57829 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -53,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from " + player); } player.sendPacket(ActionFailed.STATIC_PACKET); return; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 79db1768e6..044ebba720 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -51,7 +51,7 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 1c19213904..639d2105e3 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -76,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " requested Henna Draw remove without any henna."); player.sendPacket(ActionFailed.STATIC_PACKET); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java index 2cdc066ead..f5713d967d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java @@ -50,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty html link!"); + PacketLogger.warning(player + " sent empty html link!"); return; } if (_link.contains("..")) { - PacketLogger.warning("Player " + player.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning(player + " sent invalid html link: link " + _link); return; } final int htmlObjectId = player.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - PacketLogger.warning("Player " + player.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning(player + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 2cd9c6a8d1..62b2ef4c5a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -93,7 +93,7 @@ public class RequestPackageSend implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 0d49ebb0f5..57db48ddb4 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -108,7 +108,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own attachment!", Config.DEFAULT_PUNISH); return; } @@ -135,19 +135,19 @@ public class RequestPostAttachment implements IClientIncomingPacket // Calculate needed slots if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } @@ -194,7 +194,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java index 2ded12e55d..f70e24e74c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java @@ -135,7 +135,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket if ((storePlayer.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL) && (storeList.getItemCount() > _items.size())) { - final String msgErr = "[RequestPrivateStoreBuy] player " + player.getName() + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; + final String msgErr = "[RequestPrivateStoreBuy] " + player + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java index 6ffcc69313..cbf78835a6 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java @@ -65,7 +65,7 @@ public class RequestReceivedPost implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to receive not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to receive not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java index a150cfa85e..ed52eb784a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java @@ -131,13 +131,13 @@ public class RequestRecipeShopListSet implements IClientIncomingPacket } if (!player.hasRecipeList(recipe.getId())) { - Util.handleIllegalPlayerAction(player, "Warning!! Player " + player.getName() + " of account " + player.getAccountName() + " tried to set recipe which he dont have.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set recipe which he does not have.", Config.DEFAULT_PUNISH); return; } if (recipeCost > MAX_ADENA) { - Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to set price of " + recipeCost + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set price of " + recipeCost + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); return; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java index 55c75f0292..ac8373ebdf 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java @@ -49,7 +49,7 @@ public class RequestRecipeShopMessageSet implements IClientIncomingPacket if ((_name != null) && (_name.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java index 1a7c1ebc0f..154c1276dd 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java @@ -77,7 +77,7 @@ public class RequestRejectPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java index 1cf200da52..9f4036d402 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java @@ -64,7 +64,7 @@ public class RequestSentPost implements IClientIncomingPacket if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to read not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to read not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 04f5293545..d285ab1b5d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -134,7 +134,7 @@ public class Say2 implements IClientIncomingPacket if (Config.L2WALKER_PROTECTION && (chatType == ChatType.WHISPER) && checkBot(_text)) { - Util.handleIllegalPlayerAction(player, "Client Emulator Detect: Player " + player.getName() + " using l2walker.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Client Emulator Detect: " + player + " using L2Walker.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 13ecd08a96..1c02a4a421 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -109,7 +109,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java index 76e8ac2a68..89261d5490 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java index d86bfc8f84..88e04641cf 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java index 2726f99c08..38de85007e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java @@ -50,7 +50,7 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket if ((_msg != null) && (_msg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java index 40f802fb2c..8aea369fbc 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java @@ -86,7 +86,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket if ((player.getAbilityPoints() == 0) || (player.getAbilityPoints() == player.getAbilityPointsUsed())) { - PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning(player + " is trying to learn ability without ability points!"); return; } @@ -156,7 +156,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 1: Learning skill without having X points spent on the specific tree if (learn.getPointsRequired() > pointsSpent[learn.getTreeId() - 1]) { - PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!"); + PacketLogger.warning(player + " is trying to learn " + skill + " without enough ability points spent!"); player.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -166,7 +166,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket { if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel()) { - PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); + PacketLogger.warning(player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); player.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -175,7 +175,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 3 Learning a skill without having enough points if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points) { - PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning(player + " is trying to learn ability without ability points!"); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index bf64e21529..7def665ec6 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -67,7 +67,7 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); player.sendPacket(ExChangeAttributeFail.STATIC); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java index 7eb252c475..7842f646cd 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java @@ -61,35 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning(player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning(player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (15-day) Extension not found in inventory."); return; } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (30-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (30-day) Extension not found in inventory."); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 1b6a022140..727ebc986b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -124,12 +124,12 @@ public class RequestBRBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index 44e131c329..6eb754180a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -145,12 +145,12 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 13ef62f55f..db6c5307ee 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -61,7 +61,7 @@ public class SellListProcure implements IClientOutgoingPacket packet.writeQ(entry.getValue()); // count packet.writeH(item.getItem().getType2()); packet.writeH(0); // unknown - packet.writeQ(0); // price, u shouldnt get any adena for crops, only raw materials + packet.writeQ(0); // price, you shouldnt get any adena for crops, only raw materials } return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/Evolve.java index 51de657d97..753072b609 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/Evolve.java @@ -62,7 +62,7 @@ public class Evolve final Pet currentPet = (Pet) pet; if (currentPet.isAlikeDead()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); return false; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java index cfbbc97cae..1a5bad379a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java @@ -370,7 +370,7 @@ public class TalentShow extends AbstractNpcAI { if ((event == null) || event.isEmpty()) { - LOGGER.warning("MC_Show: Null/Empty event for npc " + npc + " and player " + player + "!"); + LOGGER.warning("MC_Show: Null/Empty event for " + npc + " and " + player + "!"); return null; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index ae90a1b19c..c3fc6493cd 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -1247,7 +1247,7 @@ public class CastleChamberlain extends AbstractNpcAI } default: { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java index 10f4d27de3..52287d6a61 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java @@ -787,12 +787,12 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader if (newClass == null) { - LOGGER.warning(getClass().getSimpleName() + ": No new classId found for player " + player); + LOGGER.warning(getClass().getSimpleName() + ": No new classId found for " + player); return false; } else if (newClass == player.getClassId()) { - LOGGER.warning(getClass().getSimpleName() + ": New classId found for player " + player + " is exactly the same as the one he currently is!"); + LOGGER.warning(getClass().getSimpleName() + ": New classId found for " + player + " is exactly the same as the one he currently is!"); return false; } else if (checkIfClassChangeHasOptions(player)) diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java index c621669129..8d38a27541 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java @@ -163,7 +163,7 @@ public class ManorManager extends AbstractNpcAI } default: { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java index 994b1e29c1..51eb102f5e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java @@ -125,7 +125,7 @@ public class SkillTransfer extends AbstractNpcAI if (count < 0) { final String className = ClassListData.getInstance().getClass(player.getClassId()).getClassName(); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " has too many transfered skills or items, skill:" + s.getName() + " (" + sk.getId() + "/" + sk.getLevel() + "), class:" + className, IllegalActionPunishmentType.BROADCAST); + Util.handleIllegalPlayerAction(player, player + " has too many transfered skills or items, skill:" + s.getName() + " (" + sk.getId() + "/" + sk.getLevel() + "), class:" + className, IllegalActionPunishmentType.BROADCAST); if (Config.SKILL_CHECK_REMOVE) { player.removeSkill(sk); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/Link.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/Link.java index 8010bd0081..5bd82b732d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/Link.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/Link.java @@ -99,13 +99,13 @@ public class Link implements IBypassHandler final String htmlPath = command.substring(4).trim(); if (htmlPath.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty link html!"); + LOGGER.warning(player + " sent empty link html!"); return false; } if (htmlPath.contains("..")) { - LOGGER.warning("Player " + player.getName() + " sent invalid link html: " + htmlPath); + LOGGER.warning(player + " sent invalid link html: " + htmlPath); return false; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/communityboard/ClanBoard.java index 3bfdf86486..a205475a6c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/communityboard/ClanBoard.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/communityboard/ClanBoard.java @@ -77,7 +77,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanList(player, 1); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan list bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan list bypass " + command + "!"); } } } @@ -97,7 +97,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanHome(player); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan home bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan home bypass " + command + "!"); } } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java index dc54e01a0b..df4f03d172 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java @@ -83,7 +83,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for " + player); } } else if (command.startsWith("bbs_add_fav")) @@ -110,7 +110,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for " + player); } } } @@ -134,7 +134,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for " + player); } } return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/communityboard/HomeBoard.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/communityboard/HomeBoard.java index 86c5869161..1124c98ea4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/communityboard/HomeBoard.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/communityboard/HomeBoard.java @@ -354,7 +354,7 @@ public class HomeBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for " + player); } return count; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/communityboard/RegionBoard.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/communityboard/RegionBoard.java index 0c5abf5c5a..c6a4392f6a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/communityboard/RegionBoard.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/communityboard/RegionBoard.java @@ -80,7 +80,7 @@ public class RegionBoard implements IWriteBoardHandler final String id = command.replace("_bbsloc;", ""); if (!Util.isDigit(id)) { - LOG.warning(RegionBoard.class.getSimpleName() + ": Player " + player + " sent and invalid region bypass " + command + "!"); + LOG.warning(RegionBoard.class.getSimpleName() + ": " + player + " sent and invalid region bypass " + command + "!"); return false; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/AbstractInstance.java index aad33470bf..d485c2c36d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/AbstractInstance.java @@ -124,7 +124,7 @@ public abstract class AbstractInstance extends AbstractNpcAI final InstanceTemplate template = manager.getInstanceTemplate(templateId); if (template == null) { - LOGGER.warning("Player " + player.getName() + " (" + player.getObjectId() + ") wants to create instance with unknown template id " + templateId + "!"); + LOGGER.warning(player + " wants to create instance with unknown template id " + templateId + "!"); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 73914d140e..e288979088 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -278,7 +278,7 @@ public class MultisellData implements IXmlReader } else { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); return; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index 34c26f1ed0..c9bd4ec11e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -99,7 +99,7 @@ public class AdminCommandHandler implements IHandler 0) { @@ -6625,7 +6625,7 @@ public class Player extends Playable // a possible restart-while-modifysubclass cheat has been attempted. // Switching to use base class player.setClassId(player.getBaseClass()); - LOGGER.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); + LOGGER.warning(player + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); } else { @@ -12932,12 +12932,12 @@ public class Player extends Playable if (nextLevel == -1) { - LOGGER.info("Removing skill " + skill + " from player " + toString()); + LOGGER.info("Removing skill " + skill + " from " + this); removeSkill(skill, true); // there is no lower skill } else { - LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString()); + LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for " + this); addSkill(SkillData.getInstance().getSkill(skill.getId(), nextLevel), true); // replace with lower one } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java index 803e700357..1f32369808 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java @@ -109,7 +109,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -121,7 +121,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -137,7 +137,7 @@ public class Teleporter extends Npc // Check for required count of params. if (st.countTokens() != 2) { - LOGGER.warning("Player " + player.getObjectId() + " send unhandled teleport command: " + command); + LOGGER.warning(player + " send unhandled teleport command: " + command); return; } @@ -145,7 +145,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); + LOGGER.warning(player + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); return; } holder.doTeleport(player, this, parseNextInt(st, -1)); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/Quest.java index 9bf4c7c05e..3b28f07381 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -1599,7 +1599,7 @@ public class Quest extends AbstractScript implements IIdentifiable final Quest q = QuestManager.getInstance().getQuest(questId); if (q == null) { - LOGGER.finer("Unknown quest " + questId + " for player " + player.getName()); + LOGGER.finer("Unknown quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestData.setInt(1, player.getObjectId()); @@ -1630,7 +1630,7 @@ public class Quest extends AbstractScript implements IIdentifiable final QuestState qs = player.getQuestState(questId); if (qs == null) { - LOGGER.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); + LOGGER.finer("Lost variable " + var + " in quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestDataVar.setInt(1, player.getObjectId()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index 59a7a0e0bb..56a0436a24 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -135,7 +135,7 @@ public class TeleportHolder { if (isNoblesse() && (player.getNobleLevel() < 1)) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } @@ -194,14 +194,14 @@ public class TeleportHolder { if (isNoblesse() && (player.getNobleLevel() < 1)) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } final TeleportLocation loc = getLocation(locId); if (loc == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport location " + locId + " within list " + _name + "!"); + LOGGER.warning(player + " requested unknown teleport location " + locId + " within list " + _name + "!"); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index f089d00223..e868730165 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -119,7 +119,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": " + player + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -136,7 +136,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { // The previous level skill has not been learned. player.sendPacket(SystemMessageId.THE_PREVIOUS_LEVEL_SKILL_HAS_NOT_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } } @@ -163,7 +163,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!canTransform(player)) { player.sendPacket(SystemMessageId.YOU_HAVE_NOT_COMPLETED_THE_NECESSARY_QUEST_FOR_SKILL_ACQUISITION); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); return; } @@ -198,7 +198,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!clan.isLearnableSubPledgeSkill(skill, _subType)) { player.sendPacket(SystemMessageId.THIS_SQUAD_SKILL_HAS_ALREADY_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } @@ -260,7 +260,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -290,7 +290,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -353,13 +353,13 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } if ((player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ITEMS_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); return; } @@ -375,7 +375,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (count >= 2) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ITEMS_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); return; } @@ -404,14 +404,14 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive() && !player.isDualClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } if ((player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ITEMS_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); return; } @@ -427,7 +427,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (count >= 2) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ITEMS_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); return; } @@ -515,7 +515,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (skillLearn.getGetLevel() > player.getLevel()) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_SKILL_LEVEL_REQUIREMENTS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); return false; } @@ -584,7 +584,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { if (!player.destroyItemByItemId("SkillLearn", itemIdCount.getId(), itemIdCount.getCount(), trainer, true)) { - Util.handleIllegalPlayerAction(player, "Somehow player " + player.getName() + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, "Somehow " + player + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); } } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index 6ac4cc7ca0..0b8b67f9a0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -91,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { player.sendPacket(ActionFailed.STATIC_PACKET); - PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 4d8e55bc8e..a64477703b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -90,7 +90,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning(player + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -301,7 +301,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (Exception e) { - PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _command + " " + e.getMessage()); + PacketLogger.warning("Exception processing bypass from " + player + ": " + _command + " " + e.getMessage()); if (player.isGM()) { final StringBuilder sb = new StringBuilder(200); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index e8d7efa6b0..afec030dc7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -69,7 +69,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to cancel not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to cancel not own post!", Config.DEFAULT_PUNISH); return; } @@ -121,19 +121,19 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items not from mail !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items not from mail !", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index c6b44e7c11..3177321420 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -89,7 +89,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info(player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java index 6d59e89936..8685cb4867 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java @@ -77,7 +77,7 @@ public class RequestDeleteReceivedPost implements IClientIncomingPacket } if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java index 88fd8b949d..c4d3846ad7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java @@ -77,7 +77,7 @@ public class RequestDeleteSentPost implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index bb8c71e69d..c42e2c57ed 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -131,7 +131,7 @@ public class RequestEnchantItem implements IClientIncomingPacket // fast auto-enchant cheat check if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " use autoenchant program ", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -141,7 +141,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", scroll.getObjectId(), 1, player, item) == null) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -151,7 +151,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if ((support != null) && (player.getInventory().destroyItem("Enchant", support.getObjectId(), 1, player, item) == null)) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -356,7 +356,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", item, player, null) == null) { // unable to destroy item, cheater ? - Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from player " + player.getName() + ", possible cheater !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from " + player + ", possible cheater !", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); if (Config.LOG_ITEM_ENCHANTS) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index b7e61d2f18..122e63d6e3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -134,7 +134,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket default: { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } } @@ -167,7 +167,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket if (attribute.getType() == opositeElement) { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); return; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java index dc903790d0..27ced7e5f8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java @@ -45,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - PacketLogger.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning(player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); } } \ No newline at end of file diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index ddaaf27e8a..ac7d0ea628 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -61,7 +61,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 7253226656..0fb3a57829 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -53,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from " + player); } player.sendPacket(ActionFailed.STATIC_PACKET); return; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 79db1768e6..044ebba720 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -51,7 +51,7 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 22bd337c41..cbab206a5f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -77,7 +77,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " requested Henna Draw remove without any henna."); player.sendPacket(ActionFailed.STATIC_PACKET); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java index 2cdc066ead..f5713d967d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java @@ -50,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty html link!"); + PacketLogger.warning(player + " sent empty html link!"); return; } if (_link.contains("..")) { - PacketLogger.warning("Player " + player.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning(player + " sent invalid html link: link " + _link); return; } final int htmlObjectId = player.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - PacketLogger.warning("Player " + player.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning(player + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 2cd9c6a8d1..62b2ef4c5a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -93,7 +93,7 @@ public class RequestPackageSend implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 0d49ebb0f5..57db48ddb4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -108,7 +108,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own attachment!", Config.DEFAULT_PUNISH); return; } @@ -135,19 +135,19 @@ public class RequestPostAttachment implements IClientIncomingPacket // Calculate needed slots if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } @@ -194,7 +194,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java index 2ded12e55d..f70e24e74c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java @@ -135,7 +135,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket if ((storePlayer.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL) && (storeList.getItemCount() > _items.size())) { - final String msgErr = "[RequestPrivateStoreBuy] player " + player.getName() + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; + final String msgErr = "[RequestPrivateStoreBuy] " + player + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java index 6ffcc69313..cbf78835a6 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java @@ -65,7 +65,7 @@ public class RequestReceivedPost implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to receive not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to receive not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java index 4db297a810..846dbb7704 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java @@ -131,13 +131,13 @@ public class RequestRecipeShopListSet implements IClientIncomingPacket } if (!player.hasRecipeList(recipe.getId())) { - Util.handleIllegalPlayerAction(player, "Warning!! Player " + player.getName() + " of account " + player.getAccountName() + " tried to set recipe which he dont have.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set recipe which he does not have.", Config.DEFAULT_PUNISH); return; } if (recipeCost > MAX_ADENA) { - Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to set price of " + recipeCost + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set price of " + recipeCost + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); return; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java index 55c75f0292..ac8373ebdf 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java @@ -49,7 +49,7 @@ public class RequestRecipeShopMessageSet implements IClientIncomingPacket if ((_name != null) && (_name.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java index 1a7c1ebc0f..154c1276dd 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java @@ -77,7 +77,7 @@ public class RequestRejectPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java index 1cf200da52..9f4036d402 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java @@ -64,7 +64,7 @@ public class RequestSentPost implements IClientIncomingPacket if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to read not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to read not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 04f5293545..d285ab1b5d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -134,7 +134,7 @@ public class Say2 implements IClientIncomingPacket if (Config.L2WALKER_PROTECTION && (chatType == ChatType.WHISPER) && checkBot(_text)) { - Util.handleIllegalPlayerAction(player, "Client Emulator Detect: Player " + player.getName() + " using l2walker.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Client Emulator Detect: " + player + " using L2Walker.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 13ecd08a96..1c02a4a421 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -109,7 +109,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java index 76e8ac2a68..89261d5490 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java index d86bfc8f84..88e04641cf 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java index 2726f99c08..38de85007e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java @@ -50,7 +50,7 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket if ((_msg != null) && (_msg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java index 40f802fb2c..8aea369fbc 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java @@ -86,7 +86,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket if ((player.getAbilityPoints() == 0) || (player.getAbilityPoints() == player.getAbilityPointsUsed())) { - PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning(player + " is trying to learn ability without ability points!"); return; } @@ -156,7 +156,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 1: Learning skill without having X points spent on the specific tree if (learn.getPointsRequired() > pointsSpent[learn.getTreeId() - 1]) { - PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!"); + PacketLogger.warning(player + " is trying to learn " + skill + " without enough ability points spent!"); player.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -166,7 +166,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket { if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel()) { - PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); + PacketLogger.warning(player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); player.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -175,7 +175,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 3 Learning a skill without having enough points if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points) { - PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning(player + " is trying to learn ability without ability points!"); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index bf64e21529..7def665ec6 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -67,7 +67,7 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); player.sendPacket(ExChangeAttributeFail.STATIC); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java index 7eb252c475..7842f646cd 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java @@ -61,35 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning(player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning(player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (15-day) Extension not found in inventory."); return; } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (30-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (30-day) Extension not found in inventory."); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 1b6a022140..727ebc986b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -124,12 +124,12 @@ public class RequestBRBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index 44e131c329..6eb754180a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -145,12 +145,12 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 13ef62f55f..db6c5307ee 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -61,7 +61,7 @@ public class SellListProcure implements IClientOutgoingPacket packet.writeQ(entry.getValue()); // count packet.writeH(item.getItem().getType2()); packet.writeH(0); // unknown - packet.writeQ(0); // price, u shouldnt get any adena for crops, only raw materials + packet.writeQ(0); // price, you shouldnt get any adena for crops, only raw materials } return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/Evolve.java index 51de657d97..753072b609 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/Evolve.java @@ -62,7 +62,7 @@ public class Evolve final Pet currentPet = (Pet) pet; if (currentPet.isAlikeDead()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); return false; } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java index cfbbc97cae..1a5bad379a 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java @@ -370,7 +370,7 @@ public class TalentShow extends AbstractNpcAI { if ((event == null) || event.isEmpty()) { - LOGGER.warning("MC_Show: Null/Empty event for npc " + npc + " and player " + player + "!"); + LOGGER.warning("MC_Show: Null/Empty event for " + npc + " and " + player + "!"); return null; } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index ae90a1b19c..c3fc6493cd 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -1247,7 +1247,7 @@ public class CastleChamberlain extends AbstractNpcAI } default: { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java index 10f4d27de3..52287d6a61 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java @@ -787,12 +787,12 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader if (newClass == null) { - LOGGER.warning(getClass().getSimpleName() + ": No new classId found for player " + player); + LOGGER.warning(getClass().getSimpleName() + ": No new classId found for " + player); return false; } else if (newClass == player.getClassId()) { - LOGGER.warning(getClass().getSimpleName() + ": New classId found for player " + player + " is exactly the same as the one he currently is!"); + LOGGER.warning(getClass().getSimpleName() + ": New classId found for " + player + " is exactly the same as the one he currently is!"); return false; } else if (checkIfClassChangeHasOptions(player)) diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java index c621669129..8d38a27541 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java @@ -163,7 +163,7 @@ public class ManorManager extends AbstractNpcAI } default: { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/bypasshandlers/Link.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/bypasshandlers/Link.java index 72e4e348d9..1fa74edabd 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/bypasshandlers/Link.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/bypasshandlers/Link.java @@ -84,13 +84,13 @@ public class Link implements IBypassHandler final String htmlPath = command.substring(4).trim(); if (htmlPath.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty link html!"); + LOGGER.warning(player + " sent empty link html!"); return false; } if (htmlPath.contains("..")) { - LOGGER.warning("Player " + player.getName() + " sent invalid link html: " + htmlPath); + LOGGER.warning(player + " sent invalid link html: " + htmlPath); return false; } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/communityboard/ClanBoard.java index 3bfdf86486..a205475a6c 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/communityboard/ClanBoard.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/communityboard/ClanBoard.java @@ -77,7 +77,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanList(player, 1); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan list bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan list bypass " + command + "!"); } } } @@ -97,7 +97,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanHome(player); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan home bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan home bypass " + command + "!"); } } } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java index dc54e01a0b..df4f03d172 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java @@ -83,7 +83,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for " + player); } } else if (command.startsWith("bbs_add_fav")) @@ -110,7 +110,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for " + player); } } } @@ -134,7 +134,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for " + player); } } return true; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/communityboard/HomeBoard.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/communityboard/HomeBoard.java index 298f0c5826..76a9d33c60 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/communityboard/HomeBoard.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/communityboard/HomeBoard.java @@ -354,7 +354,7 @@ public class HomeBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for " + player); } return count; } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/communityboard/RegionBoard.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/communityboard/RegionBoard.java index 0c5abf5c5a..c6a4392f6a 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/communityboard/RegionBoard.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/communityboard/RegionBoard.java @@ -80,7 +80,7 @@ public class RegionBoard implements IWriteBoardHandler final String id = command.replace("_bbsloc;", ""); if (!Util.isDigit(id)) { - LOG.warning(RegionBoard.class.getSimpleName() + ": Player " + player + " sent and invalid region bypass " + command + "!"); + LOG.warning(RegionBoard.class.getSimpleName() + ": " + player + " sent and invalid region bypass " + command + "!"); return false; } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/AbstractInstance.java index aad33470bf..d485c2c36d 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/AbstractInstance.java @@ -124,7 +124,7 @@ public abstract class AbstractInstance extends AbstractNpcAI final InstanceTemplate template = manager.getInstanceTemplate(templateId); if (template == null) { - LOGGER.warning("Player " + player.getName() + " (" + player.getObjectId() + ") wants to create instance with unknown template id " + templateId + "!"); + LOGGER.warning(player + " wants to create instance with unknown template id " + templateId + "!"); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 73914d140e..e288979088 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -278,7 +278,7 @@ public class MultisellData implements IXmlReader } else { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); return; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index 34c26f1ed0..c9bd4ec11e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -99,7 +99,7 @@ public class AdminCommandHandler implements IHandler 0) { @@ -6723,7 +6723,7 @@ public class Player extends Playable // a possible restart-while-modifysubclass cheat has been attempted. // Switching to use base class player.setClassId(player.getBaseClass()); - LOGGER.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); + LOGGER.warning(player + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); } else { @@ -13048,12 +13048,12 @@ public class Player extends Playable if (nextLevel == -1) { - LOGGER.info("Removing skill " + skill + " from player " + toString()); + LOGGER.info("Removing skill " + skill + " from " + this); removeSkill(skill, true); // there is no lower skill } else { - LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString()); + LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for " + this); addSkill(SkillData.getInstance().getSkill(skill.getId(), nextLevel), true); // replace with lower one } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java index 57669c5788..f4ad8e3e6e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java @@ -108,7 +108,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -120,7 +120,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -136,7 +136,7 @@ public class Teleporter extends Npc // Check for required count of params. if (st.countTokens() != 2) { - LOGGER.warning("Player " + player.getObjectId() + " send unhandled teleport command: " + command); + LOGGER.warning(player + " send unhandled teleport command: " + command); return; } @@ -144,7 +144,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); + LOGGER.warning(player + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); return; } holder.doTeleport(player, this, parseNextInt(st, -1)); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/quest/Quest.java index 9bf4c7c05e..3b28f07381 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -1599,7 +1599,7 @@ public class Quest extends AbstractScript implements IIdentifiable final Quest q = QuestManager.getInstance().getQuest(questId); if (q == null) { - LOGGER.finer("Unknown quest " + questId + " for player " + player.getName()); + LOGGER.finer("Unknown quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestData.setInt(1, player.getObjectId()); @@ -1630,7 +1630,7 @@ public class Quest extends AbstractScript implements IIdentifiable final QuestState qs = player.getQuestState(questId); if (qs == null) { - LOGGER.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); + LOGGER.finer("Lost variable " + var + " in quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestDataVar.setInt(1, player.getObjectId()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index 59a7a0e0bb..56a0436a24 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -135,7 +135,7 @@ public class TeleportHolder { if (isNoblesse() && (player.getNobleLevel() < 1)) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } @@ -194,14 +194,14 @@ public class TeleportHolder { if (isNoblesse() && (player.getNobleLevel() < 1)) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } final TeleportLocation loc = getLocation(locId); if (loc == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport location " + locId + " within list " + _name + "!"); + LOGGER.warning(player + " requested unknown teleport location " + locId + " within list " + _name + "!"); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index f089d00223..e868730165 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -119,7 +119,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": " + player + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -136,7 +136,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { // The previous level skill has not been learned. player.sendPacket(SystemMessageId.THE_PREVIOUS_LEVEL_SKILL_HAS_NOT_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } } @@ -163,7 +163,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!canTransform(player)) { player.sendPacket(SystemMessageId.YOU_HAVE_NOT_COMPLETED_THE_NECESSARY_QUEST_FOR_SKILL_ACQUISITION); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); return; } @@ -198,7 +198,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!clan.isLearnableSubPledgeSkill(skill, _subType)) { player.sendPacket(SystemMessageId.THIS_SQUAD_SKILL_HAS_ALREADY_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } @@ -260,7 +260,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -290,7 +290,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -353,13 +353,13 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } if ((player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ITEMS_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); return; } @@ -375,7 +375,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (count >= 2) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ITEMS_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); return; } @@ -404,14 +404,14 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive() && !player.isDualClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } if ((player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ITEMS_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); return; } @@ -427,7 +427,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (count >= 2) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ITEMS_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); return; } @@ -515,7 +515,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (skillLearn.getGetLevel() > player.getLevel()) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_SKILL_LEVEL_REQUIREMENTS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); return false; } @@ -584,7 +584,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { if (!player.destroyItemByItemId("SkillLearn", itemIdCount.getId(), itemIdCount.getCount(), trainer, true)) { - Util.handleIllegalPlayerAction(player, "Somehow player " + player.getName() + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, "Somehow " + player + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); } } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index 6ac4cc7ca0..0b8b67f9a0 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -91,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { player.sendPacket(ActionFailed.STATIC_PACKET); - PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 4d8e55bc8e..a64477703b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -90,7 +90,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning(player + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -301,7 +301,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (Exception e) { - PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _command + " " + e.getMessage()); + PacketLogger.warning("Exception processing bypass from " + player + ": " + _command + " " + e.getMessage()); if (player.isGM()) { final StringBuilder sb = new StringBuilder(200); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index e8d7efa6b0..afec030dc7 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -69,7 +69,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to cancel not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to cancel not own post!", Config.DEFAULT_PUNISH); return; } @@ -121,19 +121,19 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items not from mail !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items not from mail !", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index c6b44e7c11..3177321420 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -89,7 +89,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info(player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java index 6d59e89936..8685cb4867 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java @@ -77,7 +77,7 @@ public class RequestDeleteReceivedPost implements IClientIncomingPacket } if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java index 88fd8b949d..c4d3846ad7 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java @@ -77,7 +77,7 @@ public class RequestDeleteSentPost implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 325ff253dd..e6b54e37e0 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -131,7 +131,7 @@ public class RequestEnchantItem implements IClientIncomingPacket // fast auto-enchant cheat check if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " use autoenchant program ", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -141,7 +141,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", scroll.getObjectId(), 1, player, item) == null) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -151,7 +151,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if ((support != null) && (player.getInventory().destroyItem("Enchant", support.getObjectId(), 1, player, item) == null)) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -356,7 +356,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", item, player, null) == null) { // unable to destroy item, cheater ? - Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from player " + player.getName() + ", possible cheater !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from " + player + ", possible cheater !", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); if (Config.LOG_ITEM_ENCHANTS) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index b7e61d2f18..122e63d6e3 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -134,7 +134,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket default: { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } } @@ -167,7 +167,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket if (attribute.getType() == opositeElement) { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); return; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java index dc903790d0..27ced7e5f8 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java @@ -45,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - PacketLogger.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning(player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); } } \ No newline at end of file diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index ddaaf27e8a..ac7d0ea628 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -61,7 +61,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 7253226656..0fb3a57829 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -53,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from " + player); } player.sendPacket(ActionFailed.STATIC_PACKET); return; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 79db1768e6..044ebba720 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -51,7 +51,7 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 22bd337c41..cbab206a5f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -77,7 +77,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " requested Henna Draw remove without any henna."); player.sendPacket(ActionFailed.STATIC_PACKET); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java index 2cdc066ead..f5713d967d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java @@ -50,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty html link!"); + PacketLogger.warning(player + " sent empty html link!"); return; } if (_link.contains("..")) { - PacketLogger.warning("Player " + player.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning(player + " sent invalid html link: link " + _link); return; } final int htmlObjectId = player.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - PacketLogger.warning("Player " + player.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning(player + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index e8de8fee2a..8dae89d3bf 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -86,7 +86,7 @@ public class RequestPackageSend implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 0d49ebb0f5..57db48ddb4 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -108,7 +108,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own attachment!", Config.DEFAULT_PUNISH); return; } @@ -135,19 +135,19 @@ public class RequestPostAttachment implements IClientIncomingPacket // Calculate needed slots if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } @@ -194,7 +194,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java index 2ded12e55d..f70e24e74c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java @@ -135,7 +135,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket if ((storePlayer.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL) && (storeList.getItemCount() > _items.size())) { - final String msgErr = "[RequestPrivateStoreBuy] player " + player.getName() + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; + final String msgErr = "[RequestPrivateStoreBuy] " + player + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java index 6ffcc69313..cbf78835a6 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java @@ -65,7 +65,7 @@ public class RequestReceivedPost implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to receive not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to receive not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java index 4db297a810..846dbb7704 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java @@ -131,13 +131,13 @@ public class RequestRecipeShopListSet implements IClientIncomingPacket } if (!player.hasRecipeList(recipe.getId())) { - Util.handleIllegalPlayerAction(player, "Warning!! Player " + player.getName() + " of account " + player.getAccountName() + " tried to set recipe which he dont have.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set recipe which he does not have.", Config.DEFAULT_PUNISH); return; } if (recipeCost > MAX_ADENA) { - Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to set price of " + recipeCost + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set price of " + recipeCost + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); return; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java index 55c75f0292..ac8373ebdf 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java @@ -49,7 +49,7 @@ public class RequestRecipeShopMessageSet implements IClientIncomingPacket if ((_name != null) && (_name.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java index 1a7c1ebc0f..154c1276dd 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java @@ -77,7 +77,7 @@ public class RequestRejectPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java index 1cf200da52..9f4036d402 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java @@ -64,7 +64,7 @@ public class RequestSentPost implements IClientIncomingPacket if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to read not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to read not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 4e71d6d57e..707baf47b1 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -138,7 +138,7 @@ public class Say2 implements IClientIncomingPacket if (Config.L2WALKER_PROTECTION && (chatType == ChatType.WHISPER) && checkBot(_text)) { - Util.handleIllegalPlayerAction(player, "Client Emulator Detect: Player " + player.getName() + " using l2walker.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Client Emulator Detect: " + player + " using L2Walker.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 13ecd08a96..1c02a4a421 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -109,7 +109,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java index 76e8ac2a68..89261d5490 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java index d86bfc8f84..88e04641cf 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java index 2726f99c08..38de85007e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java @@ -50,7 +50,7 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket if ((_msg != null) && (_msg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java index 40f802fb2c..8aea369fbc 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java @@ -86,7 +86,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket if ((player.getAbilityPoints() == 0) || (player.getAbilityPoints() == player.getAbilityPointsUsed())) { - PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning(player + " is trying to learn ability without ability points!"); return; } @@ -156,7 +156,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 1: Learning skill without having X points spent on the specific tree if (learn.getPointsRequired() > pointsSpent[learn.getTreeId() - 1]) { - PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!"); + PacketLogger.warning(player + " is trying to learn " + skill + " without enough ability points spent!"); player.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -166,7 +166,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket { if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel()) { - PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); + PacketLogger.warning(player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); player.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -175,7 +175,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 3 Learning a skill without having enough points if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points) { - PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning(player + " is trying to learn ability without ability points!"); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index bf64e21529..7def665ec6 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -67,7 +67,7 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); player.sendPacket(ExChangeAttributeFail.STATIC); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java index 7eb252c475..7842f646cd 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java @@ -61,35 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning(player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning(player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (15-day) Extension not found in inventory."); return; } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (30-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (30-day) Extension not found in inventory."); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 1b6a022140..727ebc986b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -124,12 +124,12 @@ public class RequestBRBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index 44e131c329..6eb754180a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -145,12 +145,12 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 13ef62f55f..db6c5307ee 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -61,7 +61,7 @@ public class SellListProcure implements IClientOutgoingPacket packet.writeQ(entry.getValue()); // count packet.writeH(item.getItem().getType2()); packet.writeH(0); // unknown - packet.writeQ(0); // price, u shouldnt get any adena for crops, only raw materials + packet.writeQ(0); // price, you shouldnt get any adena for crops, only raw materials } return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/Evolve.java index 51de657d97..753072b609 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/Evolve.java @@ -62,7 +62,7 @@ public class Evolve final Pet currentPet = (Pet) pet; if (currentPet.isAlikeDead()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); return false; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java index cfbbc97cae..1a5bad379a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java @@ -370,7 +370,7 @@ public class TalentShow extends AbstractNpcAI { if ((event == null) || event.isEmpty()) { - LOGGER.warning("MC_Show: Null/Empty event for npc " + npc + " and player " + player + "!"); + LOGGER.warning("MC_Show: Null/Empty event for " + npc + " and " + player + "!"); return null; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index ae90a1b19c..c3fc6493cd 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -1247,7 +1247,7 @@ public class CastleChamberlain extends AbstractNpcAI } default: { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java index 10f4d27de3..52287d6a61 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java @@ -787,12 +787,12 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader if (newClass == null) { - LOGGER.warning(getClass().getSimpleName() + ": No new classId found for player " + player); + LOGGER.warning(getClass().getSimpleName() + ": No new classId found for " + player); return false; } else if (newClass == player.getClassId()) { - LOGGER.warning(getClass().getSimpleName() + ": New classId found for player " + player + " is exactly the same as the one he currently is!"); + LOGGER.warning(getClass().getSimpleName() + ": New classId found for " + player + " is exactly the same as the one he currently is!"); return false; } else if (checkIfClassChangeHasOptions(player)) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java index c621669129..8d38a27541 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java @@ -163,7 +163,7 @@ public class ManorManager extends AbstractNpcAI } default: { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/bypasshandlers/Link.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/bypasshandlers/Link.java index 72e4e348d9..1fa74edabd 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/bypasshandlers/Link.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/bypasshandlers/Link.java @@ -84,13 +84,13 @@ public class Link implements IBypassHandler final String htmlPath = command.substring(4).trim(); if (htmlPath.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty link html!"); + LOGGER.warning(player + " sent empty link html!"); return false; } if (htmlPath.contains("..")) { - LOGGER.warning("Player " + player.getName() + " sent invalid link html: " + htmlPath); + LOGGER.warning(player + " sent invalid link html: " + htmlPath); return false; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/communityboard/ClanBoard.java index 3bfdf86486..a205475a6c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/communityboard/ClanBoard.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/communityboard/ClanBoard.java @@ -77,7 +77,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanList(player, 1); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan list bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan list bypass " + command + "!"); } } } @@ -97,7 +97,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanHome(player); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan home bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan home bypass " + command + "!"); } } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java index dc54e01a0b..df4f03d172 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java @@ -83,7 +83,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for " + player); } } else if (command.startsWith("bbs_add_fav")) @@ -110,7 +110,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for " + player); } } } @@ -134,7 +134,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for " + player); } } return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/communityboard/HomeBoard.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/communityboard/HomeBoard.java index 298f0c5826..76a9d33c60 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/communityboard/HomeBoard.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/communityboard/HomeBoard.java @@ -354,7 +354,7 @@ public class HomeBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for " + player); } return count; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/communityboard/RegionBoard.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/communityboard/RegionBoard.java index 0c5abf5c5a..c6a4392f6a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/communityboard/RegionBoard.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/communityboard/RegionBoard.java @@ -80,7 +80,7 @@ public class RegionBoard implements IWriteBoardHandler final String id = command.replace("_bbsloc;", ""); if (!Util.isDigit(id)) { - LOG.warning(RegionBoard.class.getSimpleName() + ": Player " + player + " sent and invalid region bypass " + command + "!"); + LOG.warning(RegionBoard.class.getSimpleName() + ": " + player + " sent and invalid region bypass " + command + "!"); return false; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/AbstractInstance.java index aad33470bf..d485c2c36d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/AbstractInstance.java @@ -124,7 +124,7 @@ public abstract class AbstractInstance extends AbstractNpcAI final InstanceTemplate template = manager.getInstanceTemplate(templateId); if (template == null) { - LOGGER.warning("Player " + player.getName() + " (" + player.getObjectId() + ") wants to create instance with unknown template id " + templateId + "!"); + LOGGER.warning(player + " wants to create instance with unknown template id " + templateId + "!"); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 73914d140e..e288979088 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -278,7 +278,7 @@ public class MultisellData implements IXmlReader } else { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); return; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index 34c26f1ed0..c9bd4ec11e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -99,7 +99,7 @@ public class AdminCommandHandler implements IHandler 0) { @@ -6740,7 +6740,7 @@ public class Player extends Playable // a possible restart-while-modifysubclass cheat has been attempted. // Switching to use base class player.setClassId(player.getBaseClass()); - LOGGER.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); + LOGGER.warning(player + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); } else { @@ -13086,12 +13086,12 @@ public class Player extends Playable if (nextLevel == -1) { - LOGGER.info("Removing skill " + skill + " from player " + toString()); + LOGGER.info("Removing skill " + skill + " from " + this); removeSkill(skill, true); // there is no lower skill } else { - LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString()); + LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for " + this); addSkill(SkillData.getInstance().getSkill(skill.getId(), nextLevel), true); // replace with lower one } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java index 57669c5788..f4ad8e3e6e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java @@ -108,7 +108,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -120,7 +120,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -136,7 +136,7 @@ public class Teleporter extends Npc // Check for required count of params. if (st.countTokens() != 2) { - LOGGER.warning("Player " + player.getObjectId() + " send unhandled teleport command: " + command); + LOGGER.warning(player + " send unhandled teleport command: " + command); return; } @@ -144,7 +144,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); + LOGGER.warning(player + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); return; } holder.doTeleport(player, this, parseNextInt(st, -1)); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/quest/Quest.java index 9bf4c7c05e..3b28f07381 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -1599,7 +1599,7 @@ public class Quest extends AbstractScript implements IIdentifiable final Quest q = QuestManager.getInstance().getQuest(questId); if (q == null) { - LOGGER.finer("Unknown quest " + questId + " for player " + player.getName()); + LOGGER.finer("Unknown quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestData.setInt(1, player.getObjectId()); @@ -1630,7 +1630,7 @@ public class Quest extends AbstractScript implements IIdentifiable final QuestState qs = player.getQuestState(questId); if (qs == null) { - LOGGER.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); + LOGGER.finer("Lost variable " + var + " in quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestDataVar.setInt(1, player.getObjectId()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index 04e9c002c2..608aca0686 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -135,7 +135,7 @@ public class TeleportHolder { if (isNoblesse() && (player.getNobleLevel() < 1)) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } @@ -194,14 +194,14 @@ public class TeleportHolder { if (isNoblesse() && (player.getNobleLevel() < 1)) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } final TeleportLocation loc = getLocation(locId); if (loc == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport location " + locId + " within list " + _name + "!"); + LOGGER.warning(player + " requested unknown teleport location " + locId + " within list " + _name + "!"); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index f089d00223..e868730165 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -119,7 +119,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": " + player + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -136,7 +136,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { // The previous level skill has not been learned. player.sendPacket(SystemMessageId.THE_PREVIOUS_LEVEL_SKILL_HAS_NOT_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } } @@ -163,7 +163,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!canTransform(player)) { player.sendPacket(SystemMessageId.YOU_HAVE_NOT_COMPLETED_THE_NECESSARY_QUEST_FOR_SKILL_ACQUISITION); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); return; } @@ -198,7 +198,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!clan.isLearnableSubPledgeSkill(skill, _subType)) { player.sendPacket(SystemMessageId.THIS_SQUAD_SKILL_HAS_ALREADY_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } @@ -260,7 +260,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -290,7 +290,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -353,13 +353,13 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } if ((player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ITEMS_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); return; } @@ -375,7 +375,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (count >= 2) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ITEMS_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); return; } @@ -404,14 +404,14 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive() && !player.isDualClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } if ((player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ITEMS_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); return; } @@ -427,7 +427,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (count >= 2) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ITEMS_TO_LEARN_THIS_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); return; } @@ -515,7 +515,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (skillLearn.getGetLevel() > player.getLevel()) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_SKILL_LEVEL_REQUIREMENTS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); return false; } @@ -584,7 +584,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { if (!player.destroyItemByItemId("SkillLearn", itemIdCount.getId(), itemIdCount.getCount(), trainer, true)) { - Util.handleIllegalPlayerAction(player, "Somehow player " + player.getName() + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, "Somehow " + player + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); } } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index 6ac4cc7ca0..0b8b67f9a0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -91,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { player.sendPacket(ActionFailed.STATIC_PACKET); - PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 4d8e55bc8e..a64477703b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -90,7 +90,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning(player + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -301,7 +301,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (Exception e) { - PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _command + " " + e.getMessage()); + PacketLogger.warning("Exception processing bypass from " + player + ": " + _command + " " + e.getMessage()); if (player.isGM()) { final StringBuilder sb = new StringBuilder(200); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index e8d7efa6b0..afec030dc7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -69,7 +69,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to cancel not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to cancel not own post!", Config.DEFAULT_PUNISH); return; } @@ -121,19 +121,19 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items not from mail !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items not from mail !", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index c6b44e7c11..3177321420 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -89,7 +89,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info(player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java index 6d59e89936..8685cb4867 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java @@ -77,7 +77,7 @@ public class RequestDeleteReceivedPost implements IClientIncomingPacket } if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java index 88fd8b949d..c4d3846ad7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java @@ -77,7 +77,7 @@ public class RequestDeleteSentPost implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 325ff253dd..e6b54e37e0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -131,7 +131,7 @@ public class RequestEnchantItem implements IClientIncomingPacket // fast auto-enchant cheat check if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " use autoenchant program ", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -141,7 +141,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", scroll.getObjectId(), 1, player, item) == null) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -151,7 +151,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if ((support != null) && (player.getInventory().destroyItem("Enchant", support.getObjectId(), 1, player, item) == null)) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -356,7 +356,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", item, player, null) == null) { // unable to destroy item, cheater ? - Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from player " + player.getName() + ", possible cheater !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from " + player + ", possible cheater !", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); if (Config.LOG_ITEM_ENCHANTS) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index b7e61d2f18..122e63d6e3 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -134,7 +134,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket default: { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } } @@ -167,7 +167,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket if (attribute.getType() == opositeElement) { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); return; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java index dc903790d0..27ced7e5f8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java @@ -45,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - PacketLogger.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning(player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); } } \ No newline at end of file diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index ddaaf27e8a..ac7d0ea628 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -61,7 +61,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 7253226656..0fb3a57829 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -53,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from " + player); } player.sendPacket(ActionFailed.STATIC_PACKET); return; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 79db1768e6..044ebba720 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -51,7 +51,7 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 22bd337c41..cbab206a5f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -77,7 +77,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " requested Henna Draw remove without any henna."); player.sendPacket(ActionFailed.STATIC_PACKET); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java index 2cdc066ead..f5713d967d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java @@ -50,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty html link!"); + PacketLogger.warning(player + " sent empty html link!"); return; } if (_link.contains("..")) { - PacketLogger.warning("Player " + player.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning(player + " sent invalid html link: link " + _link); return; } final int htmlObjectId = player.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - PacketLogger.warning("Player " + player.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning(player + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index e8de8fee2a..8dae89d3bf 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -86,7 +86,7 @@ public class RequestPackageSend implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 0d49ebb0f5..57db48ddb4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -108,7 +108,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own attachment!", Config.DEFAULT_PUNISH); return; } @@ -135,19 +135,19 @@ public class RequestPostAttachment implements IClientIncomingPacket // Calculate needed slots if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } @@ -194,7 +194,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java index 2ded12e55d..f70e24e74c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java @@ -135,7 +135,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket if ((storePlayer.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL) && (storeList.getItemCount() > _items.size())) { - final String msgErr = "[RequestPrivateStoreBuy] player " + player.getName() + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; + final String msgErr = "[RequestPrivateStoreBuy] " + player + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java index 6ffcc69313..cbf78835a6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java @@ -65,7 +65,7 @@ public class RequestReceivedPost implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to receive not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to receive not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java index 4db297a810..846dbb7704 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java @@ -131,13 +131,13 @@ public class RequestRecipeShopListSet implements IClientIncomingPacket } if (!player.hasRecipeList(recipe.getId())) { - Util.handleIllegalPlayerAction(player, "Warning!! Player " + player.getName() + " of account " + player.getAccountName() + " tried to set recipe which he dont have.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set recipe which he does not have.", Config.DEFAULT_PUNISH); return; } if (recipeCost > MAX_ADENA) { - Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to set price of " + recipeCost + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set price of " + recipeCost + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); return; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java index 55c75f0292..ac8373ebdf 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java @@ -49,7 +49,7 @@ public class RequestRecipeShopMessageSet implements IClientIncomingPacket if ((_name != null) && (_name.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java index 1a7c1ebc0f..154c1276dd 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java @@ -77,7 +77,7 @@ public class RequestRejectPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java index 1cf200da52..9f4036d402 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java @@ -64,7 +64,7 @@ public class RequestSentPost implements IClientIncomingPacket if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to read not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to read not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 4e71d6d57e..707baf47b1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -138,7 +138,7 @@ public class Say2 implements IClientIncomingPacket if (Config.L2WALKER_PROTECTION && (chatType == ChatType.WHISPER) && checkBot(_text)) { - Util.handleIllegalPlayerAction(player, "Client Emulator Detect: Player " + player.getName() + " using l2walker.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Client Emulator Detect: " + player + " using L2Walker.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 13ecd08a96..1c02a4a421 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -109,7 +109,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java index 76e8ac2a68..89261d5490 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java index d86bfc8f84..88e04641cf 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java index 2726f99c08..38de85007e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java @@ -50,7 +50,7 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket if ((_msg != null) && (_msg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java index 40f802fb2c..8aea369fbc 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java @@ -86,7 +86,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket if ((player.getAbilityPoints() == 0) || (player.getAbilityPoints() == player.getAbilityPointsUsed())) { - PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning(player + " is trying to learn ability without ability points!"); return; } @@ -156,7 +156,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 1: Learning skill without having X points spent on the specific tree if (learn.getPointsRequired() > pointsSpent[learn.getTreeId() - 1]) { - PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!"); + PacketLogger.warning(player + " is trying to learn " + skill + " without enough ability points spent!"); player.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -166,7 +166,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket { if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel()) { - PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); + PacketLogger.warning(player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); player.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -175,7 +175,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 3 Learning a skill without having enough points if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points) { - PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning(player + " is trying to learn ability without ability points!"); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index bf64e21529..7def665ec6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -67,7 +67,7 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); player.sendPacket(ExChangeAttributeFail.STATIC); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java index 7eb252c475..7842f646cd 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java @@ -61,35 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning(player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning(player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (15-day) Extension not found in inventory."); return; } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (30-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (30-day) Extension not found in inventory."); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 1b6a022140..727ebc986b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -124,12 +124,12 @@ public class RequestBRBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index 44e131c329..6eb754180a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -145,12 +145,12 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 13ef62f55f..db6c5307ee 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -61,7 +61,7 @@ public class SellListProcure implements IClientOutgoingPacket packet.writeQ(entry.getValue()); // count packet.writeH(item.getItem().getType2()); packet.writeH(0); // unknown - packet.writeQ(0); // price, u shouldnt get any adena for crops, only raw materials + packet.writeQ(0); // price, you shouldnt get any adena for crops, only raw materials } return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/Evolve.java index 51de657d97..753072b609 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/Evolve.java @@ -62,7 +62,7 @@ public class Evolve final Pet currentPet = (Pet) pet; if (currentPet.isAlikeDead()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); return false; } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java index cfbbc97cae..1a5bad379a 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java @@ -370,7 +370,7 @@ public class TalentShow extends AbstractNpcAI { if ((event == null) || event.isEmpty()) { - LOGGER.warning("MC_Show: Null/Empty event for npc " + npc + " and player " + player + "!"); + LOGGER.warning("MC_Show: Null/Empty event for " + npc + " and " + player + "!"); return null; } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index 98094f52ed..9f671f383a 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -1247,7 +1247,7 @@ public class CastleChamberlain extends AbstractNpcAI } default: { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java index 25a1ebe7e7..a30a6cb86f 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java @@ -802,12 +802,12 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader if (newClass == null) { - LOGGER.warning(getClass().getSimpleName() + ": No new classId found for player " + player); + LOGGER.warning(getClass().getSimpleName() + ": No new classId found for " + player); return false; } else if (newClass == player.getClassId()) { - LOGGER.warning(getClass().getSimpleName() + ": New classId found for player " + player + " is exactly the same as the one he currently is!"); + LOGGER.warning(getClass().getSimpleName() + ": New classId found for " + player + " is exactly the same as the one he currently is!"); return false; } else if (checkIfClassChangeHasOptions(player)) diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java index c621669129..8d38a27541 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java @@ -163,7 +163,7 @@ public class ManorManager extends AbstractNpcAI } default: { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/bypasshandlers/Link.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/bypasshandlers/Link.java index 72e4e348d9..1fa74edabd 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/bypasshandlers/Link.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/bypasshandlers/Link.java @@ -84,13 +84,13 @@ public class Link implements IBypassHandler final String htmlPath = command.substring(4).trim(); if (htmlPath.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty link html!"); + LOGGER.warning(player + " sent empty link html!"); return false; } if (htmlPath.contains("..")) { - LOGGER.warning("Player " + player.getName() + " sent invalid link html: " + htmlPath); + LOGGER.warning(player + " sent invalid link html: " + htmlPath); return false; } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/communityboard/ClanBoard.java index 3bfdf86486..a205475a6c 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/communityboard/ClanBoard.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/communityboard/ClanBoard.java @@ -77,7 +77,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanList(player, 1); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan list bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan list bypass " + command + "!"); } } } @@ -97,7 +97,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanHome(player); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan home bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan home bypass " + command + "!"); } } } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java index dc54e01a0b..df4f03d172 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java @@ -83,7 +83,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for " + player); } } else if (command.startsWith("bbs_add_fav")) @@ -110,7 +110,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for " + player); } } } @@ -134,7 +134,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for " + player); } } return true; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/communityboard/HomeBoard.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/communityboard/HomeBoard.java index 298f0c5826..76a9d33c60 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/communityboard/HomeBoard.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/communityboard/HomeBoard.java @@ -354,7 +354,7 @@ public class HomeBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for " + player); } return count; } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/communityboard/RegionBoard.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/communityboard/RegionBoard.java index 0c5abf5c5a..c6a4392f6a 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/communityboard/RegionBoard.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/communityboard/RegionBoard.java @@ -80,7 +80,7 @@ public class RegionBoard implements IWriteBoardHandler final String id = command.replace("_bbsloc;", ""); if (!Util.isDigit(id)) { - LOG.warning(RegionBoard.class.getSimpleName() + ": Player " + player + " sent and invalid region bypass " + command + "!"); + LOG.warning(RegionBoard.class.getSimpleName() + ": " + player + " sent and invalid region bypass " + command + "!"); return false; } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/AbstractInstance.java index df014e3783..4b40e5f74c 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/AbstractInstance.java @@ -124,7 +124,7 @@ public abstract class AbstractInstance extends AbstractNpcAI final InstanceTemplate template = manager.getInstanceTemplate(templateId); if (template == null) { - LOGGER.warning("Player " + player.getName() + " (" + player.getObjectId() + ") wants to create instance with unknown template id " + templateId + "!"); + LOGGER.warning(player + " wants to create instance with unknown template id " + templateId + "!"); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 73914d140e..e288979088 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -278,7 +278,7 @@ public class MultisellData implements IXmlReader } else { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); return; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index 34c26f1ed0..c9bd4ec11e 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -99,7 +99,7 @@ public class AdminCommandHandler implements IHandler 0) { @@ -6773,7 +6773,7 @@ public class Player extends Playable // a possible restart-while-modifysubclass cheat has been attempted. // Switching to use base class player.setClassId(player.getBaseClass()); - LOGGER.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); + LOGGER.warning(player + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); } else { @@ -13136,12 +13136,12 @@ public class Player extends Playable if (nextLevel == -1) { - LOGGER.info("Removing skill " + skill + " from player " + toString()); + LOGGER.info("Removing skill " + skill + " from " + this); removeSkill(skill, true); // there is no lower skill } else { - LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString()); + LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for " + this); addSkill(SkillData.getInstance().getSkill(skill.getId(), nextLevel), true); // replace with lower one } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java index 57669c5788..f4ad8e3e6e 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java @@ -108,7 +108,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -120,7 +120,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -136,7 +136,7 @@ public class Teleporter extends Npc // Check for required count of params. if (st.countTokens() != 2) { - LOGGER.warning("Player " + player.getObjectId() + " send unhandled teleport command: " + command); + LOGGER.warning(player + " send unhandled teleport command: " + command); return; } @@ -144,7 +144,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); + LOGGER.warning(player + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); return; } holder.doTeleport(player, this, parseNextInt(st, -1)); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/quest/Quest.java index 9bf4c7c05e..3b28f07381 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -1599,7 +1599,7 @@ public class Quest extends AbstractScript implements IIdentifiable final Quest q = QuestManager.getInstance().getQuest(questId); if (q == null) { - LOGGER.finer("Unknown quest " + questId + " for player " + player.getName()); + LOGGER.finer("Unknown quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestData.setInt(1, player.getObjectId()); @@ -1630,7 +1630,7 @@ public class Quest extends AbstractScript implements IIdentifiable final QuestState qs = player.getQuestState(questId); if (qs == null) { - LOGGER.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); + LOGGER.finer("Lost variable " + var + " in quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestDataVar.setInt(1, player.getObjectId()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index a7218750ab..6ec7c36e22 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -135,7 +135,7 @@ public class TeleportHolder { if (isNoblesse() && (player.getNobleLevel() < 1)) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } @@ -194,14 +194,14 @@ public class TeleportHolder { if (isNoblesse() && (player.getNobleLevel() < 1)) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } final TeleportLocation loc = getLocation(locId); if (loc == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport location " + locId + " within list " + _name + "!"); + LOGGER.warning(player + " requested unknown teleport location " + locId + " within list " + _name + "!"); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index 0abbdce752..907187a3d4 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -119,7 +119,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": " + player + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -136,7 +136,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { // The previous level skill has not been learned. player.sendPacket(SystemMessageId.THE_PREVIOUS_LEVEL_SKILL_HAS_NOT_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } } @@ -163,7 +163,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!canTransform(player)) { player.sendPacket(SystemMessageId.YOU_HAVE_NOT_COMPLETED_THE_NECESSARY_QUEST_FOR_SKILL_ACQUISITION); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); return; } @@ -198,7 +198,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!clan.isLearnableSubPledgeSkill(skill, _subType)) { player.sendPacket(SystemMessageId.THIS_SQUAD_SKILL_HAS_ALREADY_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } @@ -260,7 +260,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -290,7 +290,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -353,13 +353,13 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } if ((player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) { player.sendPacket(SystemMessageId.NOT_ENOUGH_ITEMS_TO_LEARN_THE_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); return; } @@ -375,7 +375,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (count >= 2) { player.sendPacket(SystemMessageId.NOT_ENOUGH_ITEMS_TO_LEARN_THE_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); return; } @@ -404,14 +404,14 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive() && !player.isDualClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } if ((player.getLevel() < 85) || !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) { player.sendPacket(SystemMessageId.NOT_ENOUGH_ITEMS_TO_LEARN_THE_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); return; } @@ -427,7 +427,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (count >= 2) { player.sendPacket(SystemMessageId.NOT_ENOUGH_ITEMS_TO_LEARN_THE_SKILL); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); return; } @@ -515,7 +515,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (skillLearn.getGetLevel() > player.getLevel()) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_SKILL_LEVEL_REQUIREMENTS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); return false; } @@ -584,7 +584,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { if (!player.destroyItemByItemId("SkillLearn", itemIdCount.getId(), itemIdCount.getCount(), trainer, true)) { - Util.handleIllegalPlayerAction(player, "Somehow player " + player.getName() + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, "Somehow " + player + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); } } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index 6ac4cc7ca0..0b8b67f9a0 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -91,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { player.sendPacket(ActionFailed.STATIC_PACKET); - PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 4d8e55bc8e..a64477703b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -90,7 +90,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning(player + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -301,7 +301,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (Exception e) { - PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _command + " " + e.getMessage()); + PacketLogger.warning("Exception processing bypass from " + player + ": " + _command + " " + e.getMessage()); if (player.isGM()) { final StringBuilder sb = new StringBuilder(200); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 92676f65bf..64e31664ed 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -69,7 +69,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to cancel not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to cancel not own post!", Config.DEFAULT_PUNISH); return; } @@ -121,19 +121,19 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items not from mail !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items not from mail !", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 0c530a70f2..2361dc60e4 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -89,7 +89,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info(player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java index 21e2ae8b00..894174cbd9 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java @@ -77,7 +77,7 @@ public class RequestDeleteReceivedPost implements IClientIncomingPacket } if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java index e1a9e5a5b8..ce7104edc0 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java @@ -77,7 +77,7 @@ public class RequestDeleteSentPost implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 21e762001e..928fe73e03 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -131,7 +131,7 @@ public class RequestEnchantItem implements IClientIncomingPacket // fast auto-enchant cheat check if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " use autoenchant program ", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -141,7 +141,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", scroll.getObjectId(), 1, player, item) == null) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -151,7 +151,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if ((support != null) && (player.getInventory().destroyItem("Enchant", support.getObjectId(), 1, player, item) == null)) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -356,7 +356,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", item, player, null) == null) { // unable to destroy item, cheater ? - Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from player " + player.getName() + ", possible cheater !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from " + player + ", possible cheater !", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); if (Config.LOG_ITEM_ENCHANTS) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index 6a3ea1ea5b..cb2102e374 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -134,7 +134,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket default: { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } } @@ -167,7 +167,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket if (attribute.getType() == opositeElement) { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); return; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java index dc903790d0..27ced7e5f8 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java @@ -45,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - PacketLogger.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning(player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); } } \ No newline at end of file diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 8e68e78e51..6c521093bd 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -61,7 +61,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 7253226656..0fb3a57829 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -53,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from " + player); } player.sendPacket(ActionFailed.STATIC_PACKET); return; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 79db1768e6..044ebba720 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -51,7 +51,7 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index d3883d7a89..e8a28cdb17 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -77,7 +77,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " requested Henna Draw remove without any henna."); player.sendPacket(ActionFailed.STATIC_PACKET); } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java index 2cdc066ead..f5713d967d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java @@ -50,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty html link!"); + PacketLogger.warning(player + " sent empty html link!"); return; } if (_link.contains("..")) { - PacketLogger.warning("Player " + player.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning(player + " sent invalid html link: link " + _link); return; } final int htmlObjectId = player.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - PacketLogger.warning("Player " + player.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning(player + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 5de7926bb0..aef8ae680f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -86,7 +86,7 @@ public class RequestPackageSend implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 778a6b9269..0acf549bed 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -108,7 +108,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own attachment!", Config.DEFAULT_PUNISH); return; } @@ -135,19 +135,19 @@ public class RequestPostAttachment implements IClientIncomingPacket // Calculate needed slots if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } @@ -194,7 +194,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java index 2ded12e55d..f70e24e74c 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java @@ -135,7 +135,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket if ((storePlayer.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL) && (storeList.getItemCount() > _items.size())) { - final String msgErr = "[RequestPrivateStoreBuy] player " + player.getName() + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; + final String msgErr = "[RequestPrivateStoreBuy] " + player + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java index bf72d4a94a..8eb416e456 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java @@ -65,7 +65,7 @@ public class RequestReceivedPost implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to receive not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to receive not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java index ecabf23446..3b1ec4edcf 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java @@ -131,13 +131,13 @@ public class RequestRecipeShopListSet implements IClientIncomingPacket } if (!player.hasRecipeList(recipe.getId())) { - Util.handleIllegalPlayerAction(player, "Warning!! Player " + player.getName() + " of account " + player.getAccountName() + " tried to set recipe which he dont have.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set recipe which he does not have.", Config.DEFAULT_PUNISH); return; } if (recipeCost > MAX_ADENA) { - Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to set price of " + recipeCost + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set price of " + recipeCost + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); return; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java index 55c75f0292..ac8373ebdf 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java @@ -49,7 +49,7 @@ public class RequestRecipeShopMessageSet implements IClientIncomingPacket if ((_name != null) && (_name.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java index bca101a05e..c86df54b61 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java @@ -77,7 +77,7 @@ public class RequestRejectPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java index 0022d13f9e..2ab5c8c559 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java @@ -64,7 +64,7 @@ public class RequestSentPost implements IClientIncomingPacket if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to read not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to read not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 4e71d6d57e..707baf47b1 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -138,7 +138,7 @@ public class Say2 implements IClientIncomingPacket if (Config.L2WALKER_PROTECTION && (chatType == ChatType.WHISPER) && checkBot(_text)) { - Util.handleIllegalPlayerAction(player, "Client Emulator Detect: Player " + player.getName() + " using l2walker.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Client Emulator Detect: " + player + " using L2Walker.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 9ca8059f1d..e64b7c89a8 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -109,7 +109,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java index 76e8ac2a68..89261d5490 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java index d86bfc8f84..88e04641cf 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java index 2726f99c08..38de85007e 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java @@ -50,7 +50,7 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket if ((_msg != null) && (_msg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java index 594b414096..755b6eb160 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java @@ -86,7 +86,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket if ((player.getAbilityPoints() == 0) || (player.getAbilityPoints() == player.getAbilityPointsUsed())) { - PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning(player + " is trying to learn ability without ability points!"); return; } @@ -156,7 +156,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 1: Learning skill without having X points spent on the specific tree if (learn.getPointsRequired() > pointsSpent[learn.getTreeId() - 1]) { - PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!"); + PacketLogger.warning(player + " is trying to learn " + skill + " without enough ability points spent!"); player.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -166,7 +166,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket { if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel()) { - PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); + PacketLogger.warning(player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); player.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -175,7 +175,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 3 Learning a skill without having enough points if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points) { - PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning(player + " is trying to learn ability without ability points!"); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index bf64e21529..7def665ec6 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -67,7 +67,7 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); player.sendPacket(ExChangeAttributeFail.STATIC); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java index 7eb252c475..7842f646cd 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java @@ -61,35 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning(player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning(player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (15-day) Extension not found in inventory."); return; } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (30-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (30-day) Extension not found in inventory."); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 1b6a022140..727ebc986b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -124,12 +124,12 @@ public class RequestBRBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index 44e131c329..6eb754180a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -145,12 +145,12 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 13ef62f55f..db6c5307ee 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -61,7 +61,7 @@ public class SellListProcure implements IClientOutgoingPacket packet.writeQ(entry.getValue()); // count packet.writeH(item.getItem().getType2()); packet.writeH(0); // unknown - packet.writeQ(0); // price, u shouldnt get any adena for crops, only raw materials + packet.writeQ(0); // price, you shouldnt get any adena for crops, only raw materials } return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/util/Evolve.java index 51de657d97..753072b609 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/util/Evolve.java @@ -62,7 +62,7 @@ public class Evolve final Pet currentPet = (Pet) pet; if (currentPet.isAlikeDead()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); return false; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/communitybbs/Manager/FavoriteBBSManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/communitybbs/Manager/FavoriteBBSManager.java index b8c9ae9272..665c9adc85 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/communitybbs/Manager/FavoriteBBSManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/communitybbs/Manager/FavoriteBBSManager.java @@ -78,7 +78,7 @@ public class FavoriteBBSManager extends BaseBBSManager } catch (Exception e) { - LOGGER.warning(FavoriteBBSManager.class.getSimpleName() + ": Couldn't load favorite links for player " + player.getName()); + LOGGER.warning(FavoriteBBSManager.class.getSimpleName() + ": Couldn't load favorite links for " + player); } } else if (command.startsWith("bbs_add_fav")) @@ -105,7 +105,7 @@ public class FavoriteBBSManager extends BaseBBSManager } catch (Exception e) { - LOGGER.warning(FavoriteBBSManager.class.getSimpleName() + ": Couldn't add favorite link " + command + " for player " + player.getName()); + LOGGER.warning(FavoriteBBSManager.class.getSimpleName() + ": Couldn't add favorite link " + command + " for " + player); } } } @@ -129,7 +129,7 @@ public class FavoriteBBSManager extends BaseBBSManager } catch (Exception e) { - LOGGER.warning(FavoriteBBSManager.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for player " + player.getName()); + LOGGER.warning(FavoriteBBSManager.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for " + player); } } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulCrystals.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulCrystals.java index f8c227c170..76a2f0b242 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulCrystals.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulCrystals.java @@ -108,7 +108,7 @@ public class SoulCrystals implements IItemHandler return; } - // u can use soul crystal only when target hp goes below 50% + // you can use soul crystal only when target hp goes below 50% if (((Monster) target).getCurrentHp() > (((Monster) target).getMaxHp() / 2.0)) { player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java index ee9c7367ef..20bb3025b9 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java @@ -568,7 +568,7 @@ public class DimensionalRiftManager showHtmlFile(player, "data/html/seven_signs/rift/Cheater.htm", npc); if (!player.isGM()) { - LOGGER.warning("Player " + player.getName() + "(" + player.getObjectId() + ") was cheating in dimension rift area!"); + LOGGER.warning(player + " was cheating in dimension rift area!"); Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " tried to cheat in dimensional rift.", Config.DEFAULT_PUNISH); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java index d683e61f3e..0c02da983a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java @@ -50,9 +50,9 @@ import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; /** - * @author sandman TODO: Gatekeepers shouting some text when doors get opened..so far unknown in leaked C4 is this text: 1000502 [brushes hinders competitor's monster.] which is really ugly translation TODO: Victim should attack one npc, when u save this NPC debuff zones will not be activated and + * @author sandman TODO: Gatekeepers shouting some text when doors get opened..so far unknown in leaked C4 is this text: 1000502 [brushes hinders competitor's monster.] which is really ugly translation TODO: Victim should attack one npc, when you save this NPC debuff zones will not be activated and * NPC will polymorph into some kind of Tammed Beast xD and shout: 1000503 [many thanks rescue.] which is again really ugly translation. When Victim kill this NPC, debuff zones will get activated with current core its impossible to make attack npc * npc i will try to search where is this - * prevented but still is unknown which npc u need to save to survive in next room without debuffs + * prevented but still is unknown which npc you need to save to survive in next room without debuffs */ public class FourSepulchersManager extends GrandBossManager { @@ -953,7 +953,7 @@ public class FourSepulchersManager extends GrandBossManager { if (!player.isGM()) { - LOGGER.warning("Player " + player.getName() + "(" + player.getObjectId() + ") tried to cheat in four sepulchers."); + LOGGER.warning(player + " tried to cheat in four sepulchers."); Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " tried to enter four sepulchers with invalid npc id.", Config.DEFAULT_PUNISH); } return; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/RebirthManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/RebirthManager.java index 6a0af1c1e4..3d177f39be 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/RebirthManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/RebirthManager.java @@ -115,7 +115,7 @@ public class RebirthManager // Check to see if Rebirth is enabled to avoid hacks if (!Config.REBIRTH_ENABLE) { - LOGGER.warning("[WARNING] Player " + player.getName() + " is trying to use rebirth system when it's disabled."); + LOGGER.warning("[WARNING] " + player + " is trying to use rebirth system when it's disabled."); return; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/TradeList.java index d201681a7e..e4be1c9ad6 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/TradeList.java @@ -859,7 +859,7 @@ public class TradeList if (!found) { final String msg = "Requested Item is not available to buy... You are perfoming illegal operation, it has been segnalated"; - LOGGER.warning("ATTENTION: Player " + player.getName() + " has performed buy illegal operation.."); + LOGGER.warning("ATTENTION: " + player + " has performed buy illegal operation.."); player.sendMessage(msg); return false; } @@ -1137,7 +1137,7 @@ public class TradeList if (!found) { final String msg = "Requested Item is not available to sell... You are perfoming illegal operation, it has been segnalated"; - LOGGER.warning("ATTENTION: Player " + player.getName() + " has performed sell illegal operation.."); + LOGGER.warning("ATTENTION: " + player + " has performed sell illegal operation.."); player.sendMessage(msg); return false; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/WorldObject.java index 09bede65a6..d910002129 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/WorldObject.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/WorldObject.java @@ -668,6 +668,12 @@ public abstract class WorldObject return calculateDistanceSq3D(object.getX(), object.getY(), object.getZ()); } + @Override + public boolean equals(Object obj) + { + return (obj instanceof WorldObject) && (((WorldObject) obj).getObjectId() == getObjectId()); + } + @Override public String toString() { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Attackable.java index ec025ffaec..0b57681d5d 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -244,7 +244,7 @@ public class Attackable extends Npc private final Map _aggroList = new ConcurrentHashMap<>(); /** - * Use this to Remove Object from this Map This Should be Synchronized While Interacting over This Map - ie u cant Interacting and removing object at once + * Use this to Remove Object from this Map This Should be Synchronized While Interacting over This Map - ie you cant Interacting and removing object at once * @return */ public Map getAggroList() diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java index ed6b7d1a47..d9409ce9a4 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -7998,12 +7998,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder return weaponItem.getRandomDamage(); } - @Override - public String toString() - { - return "Creature " + getObjectId(); - } - /** * Gets the attack end time. * @return the attack end time diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Npc.java index 438659a576..2b0c2036a0 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -2639,7 +2639,7 @@ public class Npc extends Creature @Override public String toString() { - return getTemplate().getName(); + return getClass().getSimpleName() + ":" + getName() + "(" + getNpcId() + ")[" + getObjectId() + "]"; } /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java index 3920777375..02f6c9a689 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -4095,26 +4095,26 @@ public class Player extends Playable { if (World.getInstance().findObject(objectId) == null) { - LOGGER.warning(getObjectId() + ": player " + this + " tried to " + action + " item not available in World."); + LOGGER.warning(this + " tried to " + action + " item not available in World."); return null; } final Item item = getInventory().getItemByObjectId(objectId); if ((item == null) || (item.getOwnerId() != getObjectId())) { - LOGGER.warning(getObjectId() + ": player " + this + " tried to " + action + " item he is not owner of."); + LOGGER.warning(this + " tried to " + action + " item he is not owner of."); return null; } if ((count < 0) || ((count > 1) && !item.isStackable())) { - LOGGER.warning(getObjectId() + ": player " + this + " tried to " + action + " item with invalid count: " + count); + LOGGER.warning(this + " tried to " + action + " item with invalid count: " + count); return null; } if (count > item.getCount()) { - LOGGER.warning(getObjectId() + ": player " + this + " tried to " + action + " more items than he owns."); + LOGGER.warning(this + " tried to " + action + " more items than he owns."); return null; } @@ -7536,7 +7536,7 @@ public class Player extends Playable // Subclass in use but doesn't exist in DB - a possible restart-while-modifysubclass cheat has been attempted. // Switching to use base class player.setClassId(player.getBaseClass()); - LOGGER.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); + LOGGER.warning(player + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); } else { @@ -10001,12 +10001,6 @@ public class Player extends Playable } } - @Override - public String toString() - { - return "player " + getName(); - } - /** * Return the modifier corresponding to the Enchant Effect of the Active Weapon (Min : 127). * @return the enchant effect @@ -12614,13 +12608,13 @@ public class Player extends Playable final Item item = getInventory().getItemByItemId(itemId); if ((item == null) || (item.getOwnerId() != getObjectId())) { - LOGGER.warning(getObjectId() + ": player " + this + " tried to " + action + " item he is not owner of"); + LOGGER.warning(this + " tried to " + action + " item he is not owner of"); return false; } if ((getActiveEnchantItem() != null) && (getActiveEnchantItem().getItemId() == itemId)) { - LOGGER.warning(getObjectId() + ":player " + this + " tried to " + action + " an enchant scroll he was using"); + LOGGER.warning(this + " tried to " + action + " an enchant scroll he was using"); return false; } @@ -12644,7 +12638,7 @@ public class Player extends Playable final Item item = getInventory().getItemByObjectId(objectId); if ((item == null) || (item.getOwnerId() != getObjectId())) { - LOGGER.warning(getObjectId() + ": player " + this + " tried to " + action + " item he is not owner of"); + LOGGER.warning(this + " tried to " + action + " item he is not owner of"); return false; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Summon.java index bd0a8c9da6..98e157d8e6 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -823,6 +823,12 @@ public abstract class Summon extends Playable return (_owner != null) && _owner.isOnEvent(); } + @Override + public String toString() + { + return super.toString() + "(" + getNpcId() + ") Owner: " + _owner; + } + @Override public Player getActingPlayer() { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/CastleWarehouse.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/CastleWarehouse.java index 4269e1a1c3..daaaf63e29 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/CastleWarehouse.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/CastleWarehouse.java @@ -132,7 +132,7 @@ public class CastleWarehouse extends Folk { if ((player.getActiveEnchantItem() != null) || (player.getActiveTradeList() != null)) { - LOGGER.info("Player " + player.getName() + " trying to use enchant exploit, ban this player!"); + LOGGER.info(player + " trying to use enchant exploit, ban this player!"); player.closeNetConnection(); return; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallSiegeInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallSiegeInfo.java index 5d3b78c21f..b8312b761d 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallSiegeInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallSiegeInfo.java @@ -222,7 +222,7 @@ public class ClanHallSiegeInfo extends Npc final Clan playerClan = player.getClan(); if ((playerClan == null) || !playerClan.getLeaderName().equalsIgnoreCase(player.getName()) || (playerClan.getLevel() < 4)) { - LOGGER.warning("Attention!!! player " + player.getName() + " use packet hack, try unregister clan."); + LOGGER.warning("Attention!!! " + player + " used packet hack, try unregister clan."); return; } if (!BanditStrongholdSiege.getInstance().isRegistrationPeriod()) @@ -246,7 +246,7 @@ public class ClanHallSiegeInfo extends Npc } else { - LOGGER.warning("Attention!!! player " + player.getName() + " use packet hack, try unregister clan."); + LOGGER.warning("Attention!!! " + player + " used packet hack, try unregister clan."); } } else if (command.startsWith("PlayerList")) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/Door.java index 0310f06333..29fd06cb93 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/Door.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/Door.java @@ -677,7 +677,7 @@ public class Door extends Creature @Override public String toString() { - return "door " + _doorId; + return getClass().getSimpleName() + "[" + _doorId + "](" + getObjectId() + ")"; } /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index 915f07bcba..74755313ae 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -331,7 +331,7 @@ public class VillageMaster extends Folk // Subclass exploit fix during add subclass if (!player.getClient().getFloodProtectors().canChangeSubclass()) { - LOGGER.warning("Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(player + " has performed a subclass change too fast"); player.setLocked(false); return; } @@ -432,7 +432,7 @@ public class VillageMaster extends Folk // Subclass exploit fix during change subclass if (!player.getClient().getFloodProtectors().canChangeSubclass()) { - LOGGER.warning("Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(player + " has performed a subclass change too fast"); player.setLocked(false); return; } @@ -493,7 +493,7 @@ public class VillageMaster extends Folk // Subclass exploit fix during delete subclass if (!player.getClient().getFloodProtectors().canChangeSubclass()) { - LOGGER.warning("Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(player + " has performed a subclass change too fast"); player.setLocked(false); return; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/instance/Item.java index ce9b41f450..06e02b4be7 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -1176,7 +1176,7 @@ public class Item extends WorldObject @Override public String toString() { - return "" + _item; + return _item + "[" + getObjectId() + "]"; } /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java index d53a1e3da1..3c59237ad5 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java @@ -320,7 +320,7 @@ class OlympiadGame } catch (Exception e) { - LOGGER.warning("Olympiad System: Game - " + _stadiumID + " on player " + player.getName() + " removals, an error has been occurred: " + e); + LOGGER.warning("Olympiad System: Game - " + _stadiumID + " on " + player + " removals, an error has been occurred: " + e); } } } @@ -457,7 +457,7 @@ class OlympiadGame } catch (Exception e) { - LOGGER.warning("Olympiad System: Game - " + _stadiumID + " on player " + player.getName() + " additions, an error has been occurred: " + e); + LOGGER.warning("Olympiad System: Game - " + _stadiumID + " on " + player + " additions, an error has been occurred: " + e); } } } @@ -484,7 +484,7 @@ class OlympiadGame } catch (Exception e) { - LOGGER.warning("Olympiad System: Game - " + _stadiumID + " on player " + player.getName() + " sendMessage, an error has been occurred: " + e); + LOGGER.warning("Olympiad System: Game - " + _stadiumID + " on " + player + " sendMessage, an error has been occurred: " + e); } } } @@ -559,7 +559,7 @@ class OlympiadGame } catch (Exception e) { - LOGGER.warning("Olympiad System: Game - " + _stadiumID + " on player " + player.getName() + " PlayersStatusBack, an error has been occurred: " + e); + LOGGER.warning("Olympiad System: Game - " + _stadiumID + " on " + player + " PlayersStatusBack, an error has been occurred: " + e); } } } @@ -904,7 +904,7 @@ class OlympiadGame } catch (Exception e) { - LOGGER.warning("Olympiad System: Game - " + _stadiumID + " on player " + player.getName() + " makeCompetitionStart, an error has been occurred: " + e); + LOGGER.warning("Olympiad System: Game - " + _stadiumID + " on " + player + " makeCompetitionStart, an error has been occurred: " + e); _aborted = true; } } @@ -1039,7 +1039,7 @@ class OlympiadGameTask implements Runnable { if ((player != null) && player.inObserverMode()) { - LOGGER.info("[OLYMPIAD DEBUG] Player " + player.getName() + "is in Observer mode!"); + LOGGER.info("[OLYMPIAD DEBUG] " + player + "is in Observer mode!"); return true; } return false; @@ -1077,7 +1077,7 @@ class OlympiadGameTask implements Runnable player.sendPacket(new ExOlympiadMode(2, player)); player.broadcastUserInfo(); - LOGGER.info("[OLYMPIAD DEBUG] Player " + player.getName() + "was on observer mode! Status restored!"); + LOGGER.info("[OLYMPIAD DEBUG] " + player + "was on observer mode! Status restored!"); } protected boolean checkBattleStatus() diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 1a318017f7..f5209f7c71 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -223,7 +223,7 @@ public class EnterWorld implements IClientIncomingPacket // Message with screen player.sendPacket(new ExShowScreenMessage(" You have an over enchanted item, you will be kicked from server! ", 6000)); // Punishment e LOGGER in audit - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " has Overenchanted item! Kicked! ", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " has overenchanted item! Kicked! ", Config.DEFAULT_PUNISH); // Logger in console PacketLogger.info("#### ATTENTION ####"); PacketLogger.info(i + " item has been removed from " + player); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index daeefd9a4f..b7969b97bc 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -63,7 +63,7 @@ public class MoveBackwardToLocation implements IClientIncomingPacket { final Player player = client.getPlayer(); player.sendPacket(SystemMessageId.A_HACKING_TOOL_HAS_BEEN_DISCOVERED_PLEASE_TRY_PLAYING_AGAIN_AFTER_CLOSING_UNNECESSARY_PROGRAMS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " trying to use L2Walker!", IllegalPlayerAction.PUNISH_KICK); + Util.handleIllegalPlayerAction(player, player + " trying to use L2Walker!", IllegalPlayerAction.PUNISH_KICK); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java index bf437745bd..8ce344f7f8 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java @@ -107,8 +107,8 @@ public class RequestAquireSkill implements IClientIncomingPacket if ((counts == 0) && !Config.ALT_GAME_SKILL_LEARN) { - player.sendMessage("You are trying to learn skill that u can't.."); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to learn skill that he can't!!!", IllegalPlayerAction.PUNISH_KICK); + player.sendMessage("You are trying to learn skill that you can't..."); + Util.handleIllegalPlayerAction(player, player + " tried to learn skill that he can't!!!", IllegalPlayerAction.PUNISH_KICK); return; } @@ -167,8 +167,8 @@ public class RequestAquireSkill implements IClientIncomingPacket if (counts == 0) { - player.sendMessage("You are trying to learn skill that u can't.."); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to learn skill that he can't!!!", IllegalPlayerAction.PUNISH_KICK); + player.sendMessage("You are trying to learn skill that you can't.."); + Util.handleIllegalPlayerAction(player, player + " tried to learn skill that he can't!!!", IllegalPlayerAction.PUNISH_KICK); return; } @@ -219,8 +219,8 @@ public class RequestAquireSkill implements IClientIncomingPacket if (counts == 0) { - player.sendMessage("You are trying to learn skill that u can't.."); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to learn skill that he can't!!!", IllegalPlayerAction.PUNISH_KICK); + player.sendMessage("You are trying to learn skill that you can't.."); + Util.handleIllegalPlayerAction(player, player + " tried to learn skill that he can't!!!", IllegalPlayerAction.PUNISH_KICK); return; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 3e3c590bc1..b2e5b0598b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -200,7 +200,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (item.isWear()) { player.setActiveEnchantItem(null); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant a weared Item", IllegalPlayerAction.PUNISH_KICK); + Util.handleIllegalPlayerAction(player, player + " tried to enchant a weared Item", IllegalPlayerAction.PUNISH_KICK); return; } @@ -591,7 +591,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (scroll == null) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a scroll he doesnt have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a scroll he doesnt have", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java index 1469afb5cb..b45e6cc59f 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java @@ -120,8 +120,8 @@ public class RequestExEnchantSkill implements IClientIncomingPacket if ((counts == 0) && !Config.ALT_GAME_SKILL_LEARN) { - player.sendMessage("You are trying to learn skill that u can't.."); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to learn skill that he can't!!!", IllegalPlayerAction.PUNISH_KICK); + player.sendMessage("You are trying to learn skill that you can't..."); + Util.handleIllegalPlayerAction(player, player + " tried to learn skill that he can't!!!", IllegalPlayerAction.PUNISH_KICK); return; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index 5e03f50d47..f23ac3d20c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -62,7 +62,7 @@ public class RequestGetItemFromPet implements IClientIncomingPacket final Pet pet = (Pet) player.getPet(); if (player.getActiveEnchantItem() != null) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " Tried To Use Enchant Exploit , And Got Banned!", IllegalPlayerAction.PUNISH_KICKBAN); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant exploit and got banned!", IllegalPlayerAction.PUNISH_KICKBAN); return; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index cb9b380e1d..bce6c980cf 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -74,7 +74,7 @@ public class RequestGiveItemToPet implements IClientIncomingPacket if (player.getActiveEnchantItem() != null) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " Tried To Use Enchant Exploit And Got Banned!", IllegalPlayerAction.PUNISH_KICKBAN); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant exploit and got banned!", IllegalPlayerAction.PUNISH_KICKBAN); return; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java index ede953f93f..f3cfdb1f25 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java @@ -119,7 +119,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket { if ((ir.getCount() > Integer.MAX_VALUE) || (ir.getCount() < 0)) { - final String msgErr = "[RequestPrivateStoreBuy] player " + player.getName() + " tried an overflow exploit, ban this player!"; + final String msgErr = "[RequestPrivateStoreBuy] " + player + " tried an overflow exploit, ban this player!"; Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH); return; } @@ -127,14 +127,14 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket final TradeItem sellersItem = storeList.getItem(ir.getObjectId()); if (sellersItem == null) { - final String msgErr = "[RequestPrivateStoreBuy] player " + player.getName() + " tried to buy an item not sold in a private store (buy), ban this player!"; + final String msgErr = "[RequestPrivateStoreBuy] " + player + " tried to buy an item not sold in a private store (buy), ban this player!"; Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH); return; } if (ir.getPrice() != sellersItem.getPrice()) { - final String msgErr = "[RequestPrivateStoreBuy] player " + player.getName() + " tried to change the seller's price in a private store (buy), ban this player!"; + final String msgErr = "[RequestPrivateStoreBuy] " + player + " tried to change the seller's price in a private store (buy), ban this player!"; Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH); return; } @@ -157,7 +157,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket // FIXME: this check should be (and most probably is) done in the TradeList mechanics if ((priceTotal < 0) || (priceTotal > Integer.MAX_VALUE)) { - final String msgErr = "[RequestPrivateStoreBuy] player " + player.getName() + " tried an overflow exploit, ban this player!"; + final String msgErr = "[RequestPrivateStoreBuy] " + player + " tried an overflow exploit, ban this player!"; Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH); return; } @@ -180,7 +180,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket if ((storePlayer.getPrivateStoreType() == Player.STORE_PRIVATE_PACKAGE_SELL) && (storeList.getItemCount() > _count)) { - final String msgErr = "[RequestPrivateStoreBuy] player " + player.getName() + " tried to buy less items then sold by package-sell, ban this player for bot-usage!"; + final String msgErr = "[RequestPrivateStoreBuy] " + player + " tried to buy less items then sold by package-sell, ban this player for bot-usage!"; Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageBuy.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageBuy.java index cd4a96074b..19124e0448 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageBuy.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageBuy.java @@ -47,8 +47,8 @@ public class RequestPrivateStoreManageBuy implements IClientIncomingPacket // Fix for privatestore exploit during login if (!player.isSpawned() || player.isLocked()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " try exploit at login with privatestore!", Config.DEFAULT_PUNISH); - PacketLogger.warning("Player " + player.getName() + " try exploit at login with privatestore!"); + Util.handleIllegalPlayerAction(player, player + " try exploit at login with privatestore!", Config.DEFAULT_PUNISH); + PacketLogger.warning(player + " try exploit at login with privatestore!"); return; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java index 8505c47ce7..0a6198f3d7 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java @@ -47,8 +47,8 @@ public class RequestPrivateStoreManageSell implements IClientIncomingPacket // Fix for privatestore exploit during login if (!player.isSpawned() || player.isLocked()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " try exploit at login with privatestore!", Config.DEFAULT_PUNISH); - PacketLogger.warning("Player " + player.getName() + " try exploit at login with privatestore!"); + Util.handleIllegalPlayerAction(player, player + " try exploit at login with privatestore!", Config.DEFAULT_PUNISH); + PacketLogger.warning(player + " try exploit at login with privatestore!"); return; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java index fdb8ecc319..74f714d820 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java @@ -157,8 +157,8 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket if (!storeList.PrivateStoreSell(player, _items, _price)) { player.sendPacket(ActionFailed.STATIC_PACKET); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " provided invalid list or request! ", Config.DEFAULT_PUNISH); - PacketLogger.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + Util.handleIllegalPlayerAction(player, player + " provided invalid list or request! ", Config.DEFAULT_PUNISH); + PacketLogger.warning("PrivateStore sell has failed due to invalid list or request. " + player + ", Private store of " + storePlayer); return; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index a1bee2d57b..4319608033 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -68,7 +68,7 @@ public class RequestRestart implements IClientIncomingPacket // Check if player are changing class if (player.isLocked()) { - PacketLogger.warning("Player " + player.getName() + " tried to restart during class change."); + PacketLogger.warning(player + " tried to restart during class change."); player.sendPacket(RestartResponse.valueOf(false)); return; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index ab1f537f80..94be4ddbe3 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -156,7 +156,7 @@ public class Say2 implements IClientIncomingPacket if (Config.L2WALKER_PROTECTION && (chatType == ChatType.WHISPER) && checkBot(_text)) { - Util.handleIllegalPlayerAction(player, "Client Emulator Detect: Player " + player.getName() + " using l2walker.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Client Emulator Detect: " + player + " using L2Walker.", Config.DEFAULT_PUNISH); return; } _text = _text.replaceAll("\\\\n", ""); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java index 45114728f5..e4b7c33904 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java @@ -117,7 +117,7 @@ public class SetPrivateStoreListSell implements IClientIncomingPacket final int price = _items[(i * 3) + 2]; if (price <= 0) { - final String msgErr = "[SetPrivateStoreListSell] player " + player.getName() + " tried an overflow exploit (use PHX), ban this player!"; + final String msgErr = "[SetPrivateStoreListSell] " + player + " tried an overflow exploit (use PHX), ban this player!"; Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH); _count = 0; return; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/TradeDone.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/TradeDone.java index 7b1ddce951..4d173db177 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/TradeDone.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/TradeDone.java @@ -54,7 +54,7 @@ public class TradeDone implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - // LOGGER.warning("player.getTradeList == null in " + getType() + " for player " + player.getName()); + // LOGGER.warning("player.getTradeList == null in " + getType() + " for " + player); return; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 1dcf353e75..55f4ed272f 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -285,7 +285,7 @@ public class UseItem implements IClientIncomingPacket if ((Config.MAX_ITEM_ENCHANT_KICK > 0) && !player.isGM() && (item.getEnchantLevel() > Config.MAX_ITEM_ENCHANT_KICK)) { player.sendMessage("You have been kicked for using an item overenchanted!"); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " has item Overenchanted! Kicked ", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " has item Overenchanted! Kicked ", Config.DEFAULT_PUNISH); // player.closeNetConnection(); return; } @@ -311,7 +311,7 @@ public class UseItem implements IClientIncomingPacket { // player.setAccountAccesslevel(-1); //ban player.sendMessage("You have been banned for using an item wich is over enchanted!"); // message - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " has item Overenchanted! ", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " has item Overenchanted! ", Config.DEFAULT_PUNISH); // player.closeNetConnection(); //kick return; } @@ -329,7 +329,7 @@ public class UseItem implements IClientIncomingPacket { // player.setAccountAccesslevel(-1); //ban player.sendMessage("You have been banned for using an item wich is over enchanted!"); // message - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " has item Overenchanted! ", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " has item Overenchanted! ", Config.DEFAULT_PUNISH); // player.closeNetConnection(); //kick return; } @@ -345,7 +345,7 @@ public class UseItem implements IClientIncomingPacket { // player.setAccountAccesslevel(-1); //ban player.sendMessage("You have been banned for using an item wich is over enchanted!"); // message - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " has item Overenchanted! ", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " has item Overenchanted! ", Config.DEFAULT_PUNISH); // player.closeNetConnection(); //kick return; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index c64f749876..90e2ae6fa6 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -70,7 +70,7 @@ public class SellListProcure implements IClientOutgoingPacket packet.writeD(entry.getValue()); // count packet.writeH(item.getItem().getType2()); packet.writeH(0); // unknown - packet.writeD(0); // price, u shouldnt get any adena for crops, only raw materials + packet.writeD(0); // price, you shouldnt get any adena for crops, only raw materials } return true; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/FavoriteBBSManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/FavoriteBBSManager.java index b8c9ae9272..665c9adc85 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/FavoriteBBSManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/FavoriteBBSManager.java @@ -78,7 +78,7 @@ public class FavoriteBBSManager extends BaseBBSManager } catch (Exception e) { - LOGGER.warning(FavoriteBBSManager.class.getSimpleName() + ": Couldn't load favorite links for player " + player.getName()); + LOGGER.warning(FavoriteBBSManager.class.getSimpleName() + ": Couldn't load favorite links for " + player); } } else if (command.startsWith("bbs_add_fav")) @@ -105,7 +105,7 @@ public class FavoriteBBSManager extends BaseBBSManager } catch (Exception e) { - LOGGER.warning(FavoriteBBSManager.class.getSimpleName() + ": Couldn't add favorite link " + command + " for player " + player.getName()); + LOGGER.warning(FavoriteBBSManager.class.getSimpleName() + ": Couldn't add favorite link " + command + " for " + player); } } } @@ -129,7 +129,7 @@ public class FavoriteBBSManager extends BaseBBSManager } catch (Exception e) { - LOGGER.warning(FavoriteBBSManager.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for player " + player.getName()); + LOGGER.warning(FavoriteBBSManager.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for " + player); } } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/AugmentationData.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/AugmentationData.java index 6800ef1a34..fbcfaabdc1 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/AugmentationData.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/AugmentationData.java @@ -334,7 +334,7 @@ public class AugmentationData // Second: decide which grade the augmentation result is going to have: // 0:yellow, 1:blue, 2:purple, 3:red - // The chances used here are most likely custom, whats known is: u can also get a red result from a normal grade lifeStone however I will make it so that a higher grade lifeStone will more likely result in a higher grade augmentation... + // The chances used here are most likely custom, whats known is: you can also get a red result from a normal grade lifeStone however I will make it so that a higher grade lifeStone will more likely result in a higher grade augmentation... // and the augmentation result will at least have the grade of the life stone // Second: Calculate the subblock offset for the choosen color, and the level of the lifeStone // Whats is known: you cant have yellow with skill(or baseStatModifier) noGrade stone can not have glow, mid only with skill, high has a chance(custom), top allways glow diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulCrystals.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulCrystals.java index f8c227c170..76a2f0b242 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulCrystals.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulCrystals.java @@ -108,7 +108,7 @@ public class SoulCrystals implements IItemHandler return; } - // u can use soul crystal only when target hp goes below 50% + // you can use soul crystal only when target hp goes below 50% if (((Monster) target).getCurrentHp() > (((Monster) target).getMaxHp() / 2.0)) { player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java index ee9c7367ef..20bb3025b9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java @@ -568,7 +568,7 @@ public class DimensionalRiftManager showHtmlFile(player, "data/html/seven_signs/rift/Cheater.htm", npc); if (!player.isGM()) { - LOGGER.warning("Player " + player.getName() + "(" + player.getObjectId() + ") was cheating in dimension rift area!"); + LOGGER.warning(player + " was cheating in dimension rift area!"); Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " tried to cheat in dimensional rift.", Config.DEFAULT_PUNISH); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java index d683e61f3e..0c02da983a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java @@ -50,9 +50,9 @@ import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; /** - * @author sandman TODO: Gatekeepers shouting some text when doors get opened..so far unknown in leaked C4 is this text: 1000502 [brushes hinders competitor's monster.] which is really ugly translation TODO: Victim should attack one npc, when u save this NPC debuff zones will not be activated and + * @author sandman TODO: Gatekeepers shouting some text when doors get opened..so far unknown in leaked C4 is this text: 1000502 [brushes hinders competitor's monster.] which is really ugly translation TODO: Victim should attack one npc, when you save this NPC debuff zones will not be activated and * NPC will polymorph into some kind of Tammed Beast xD and shout: 1000503 [many thanks rescue.] which is again really ugly translation. When Victim kill this NPC, debuff zones will get activated with current core its impossible to make attack npc * npc i will try to search where is this - * prevented but still is unknown which npc u need to save to survive in next room without debuffs + * prevented but still is unknown which npc you need to save to survive in next room without debuffs */ public class FourSepulchersManager extends GrandBossManager { @@ -953,7 +953,7 @@ public class FourSepulchersManager extends GrandBossManager { if (!player.isGM()) { - LOGGER.warning("Player " + player.getName() + "(" + player.getObjectId() + ") tried to cheat in four sepulchers."); + LOGGER.warning(player + " tried to cheat in four sepulchers."); Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " tried to enter four sepulchers with invalid npc id.", Config.DEFAULT_PUNISH); } return; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RebirthManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RebirthManager.java index 6a0af1c1e4..3d177f39be 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RebirthManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RebirthManager.java @@ -115,7 +115,7 @@ public class RebirthManager // Check to see if Rebirth is enabled to avoid hacks if (!Config.REBIRTH_ENABLE) { - LOGGER.warning("[WARNING] Player " + player.getName() + " is trying to use rebirth system when it's disabled."); + LOGGER.warning("[WARNING] " + player + " is trying to use rebirth system when it's disabled."); return; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java index c4deca39c5..1789f42539 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java @@ -871,7 +871,7 @@ public class TradeList if (!found) { final String msg = "Requested Item is not available to buy... You are perfoming illegal operation, it has been segnalated"; - LOGGER.warning("ATTENTION: Player " + player.getName() + " has performed buy illegal operation.."); + LOGGER.warning("ATTENTION: " + player + " has performed buy illegal operation.."); player.sendMessage(msg); return false; } @@ -1149,7 +1149,7 @@ public class TradeList if (!found) { final String msg = "Requested Item is not available to sell... You are perfoming illegal operation, it has been segnalated"; - LOGGER.warning("ATTENTION: Player " + player.getName() + " has performed sell illegal operation.."); + LOGGER.warning("ATTENTION: " + player + " has performed sell illegal operation.."); player.sendMessage(msg); return false; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/WorldObject.java index 09bede65a6..d910002129 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/WorldObject.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/WorldObject.java @@ -668,6 +668,12 @@ public abstract class WorldObject return calculateDistanceSq3D(object.getX(), object.getY(), object.getZ()); } + @Override + public boolean equals(Object obj) + { + return (obj instanceof WorldObject) && (((WorldObject) obj).getObjectId() == getObjectId()); + } + @Override public String toString() { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java index a3b797bf95..5f8f15fa7b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -245,7 +245,7 @@ public class Attackable extends Npc private final Map _aggroList = new ConcurrentHashMap<>(); /** - * Use this to Remove Object from this Map This Should be Synchronized While Interacting over This Map - ie u cant Interacting and removing object at once + * Use this to Remove Object from this Map This Should be Synchronized While Interacting over This Map - ie you cant Interacting and removing object at once * @return */ public Map getAggroList() diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java index a0f508f94c..995b7c299c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -8045,12 +8045,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder return weaponItem.getRandomDamage(); } - @Override - public String toString() - { - return "Creature " + getObjectId(); - } - /** * Gets the attack end time. * @return the attack end time diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java index fb1b5f5243..3f11d04587 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -2842,7 +2842,7 @@ public class Npc extends Creature @Override public String toString() { - return getTemplate().getName(); + return getClass().getSimpleName() + ":" + getName() + "(" + getNpcId() + ")[" + getObjectId() + "]"; } /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java index 2d690fafa1..4a4d079242 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -4171,26 +4171,26 @@ public class Player extends Playable { if (World.getInstance().findObject(objectId) == null) { - LOGGER.warning(getObjectId() + ": player " + this + " tried to " + action + " item not available in World."); + LOGGER.warning(this + " tried to " + action + " item not available in World."); return null; } final Item item = getInventory().getItemByObjectId(objectId); if ((item == null) || (item.getOwnerId() != getObjectId())) { - LOGGER.warning(getObjectId() + ": player " + this + " tried to " + action + " item he is not owner of."); + LOGGER.warning(this + " tried to " + action + " item he is not owner of."); return null; } if ((count < 0) || ((count > 1) && !item.isStackable())) { - LOGGER.warning(getObjectId() + ": player " + this + " tried to " + action + " item with invalid count: " + count); + LOGGER.warning(this + " tried to " + action + " item with invalid count: " + count); return null; } if (count > item.getCount()) { - LOGGER.warning(getObjectId() + ": player " + this + " tried to " + action + " more items than he owns."); + LOGGER.warning(this + " tried to " + action + " more items than he owns."); return null; } @@ -7687,7 +7687,7 @@ public class Player extends Playable // Subclass in use but doesn't exist in DB - a possible restart-while-modifysubclass cheat has been attempted. // Switching to use base class player.setClassId(player.getBaseClass()); - LOGGER.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); + LOGGER.warning(player + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); } else { @@ -10174,12 +10174,6 @@ public class Player extends Playable } } - @Override - public String toString() - { - return "player " + getName(); - } - /** * Return the modifier corresponding to the Enchant Effect of the Active Weapon (Min : 127). * @return the enchant effect @@ -12925,13 +12919,13 @@ public class Player extends Playable final Item item = getInventory().getItemByItemId(itemId); if ((item == null) || (item.getOwnerId() != getObjectId())) { - LOGGER.warning(getObjectId() + ": player " + this + " tried to " + action + " item he is not owner of"); + LOGGER.warning(this + " tried to " + action + " item he is not owner of"); return false; } if ((getActiveEnchantItem() != null) && (getActiveEnchantItem().getItemId() == itemId)) { - LOGGER.warning(getObjectId() + ":player " + this + " tried to " + action + " an enchant scroll he was using"); + LOGGER.warning(this + " tried to " + action + " an enchant scroll he was using"); return false; } @@ -12961,7 +12955,7 @@ public class Player extends Playable final Item item = getInventory().getItemByObjectId(objectId); if ((item == null) || (item.getOwnerId() != getObjectId())) { - LOGGER.warning(getObjectId() + ": player " + this + " tried to " + action + " item he is not owner of"); + LOGGER.warning(this + " tried to " + action + " item he is not owner of"); return false; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java index bd0a8c9da6..98e157d8e6 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -823,6 +823,12 @@ public abstract class Summon extends Playable return (_owner != null) && _owner.isOnEvent(); } + @Override + public String toString() + { + return super.toString() + "(" + getNpcId() + ") Owner: " + _owner; + } + @Override public Player getActingPlayer() { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleWarehouse.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleWarehouse.java index 4269e1a1c3..daaaf63e29 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleWarehouse.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleWarehouse.java @@ -132,7 +132,7 @@ public class CastleWarehouse extends Folk { if ((player.getActiveEnchantItem() != null) || (player.getActiveTradeList() != null)) { - LOGGER.info("Player " + player.getName() + " trying to use enchant exploit, ban this player!"); + LOGGER.info(player + " trying to use enchant exploit, ban this player!"); player.closeNetConnection(); return; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallSiegeInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallSiegeInfo.java index 5d3b78c21f..b8312b761d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallSiegeInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallSiegeInfo.java @@ -222,7 +222,7 @@ public class ClanHallSiegeInfo extends Npc final Clan playerClan = player.getClan(); if ((playerClan == null) || !playerClan.getLeaderName().equalsIgnoreCase(player.getName()) || (playerClan.getLevel() < 4)) { - LOGGER.warning("Attention!!! player " + player.getName() + " use packet hack, try unregister clan."); + LOGGER.warning("Attention!!! " + player + " used packet hack, try unregister clan."); return; } if (!BanditStrongholdSiege.getInstance().isRegistrationPeriod()) @@ -246,7 +246,7 @@ public class ClanHallSiegeInfo extends Npc } else { - LOGGER.warning("Attention!!! player " + player.getName() + " use packet hack, try unregister clan."); + LOGGER.warning("Attention!!! " + player + " used packet hack, try unregister clan."); } } else if (command.startsWith("PlayerList")) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Door.java index 0310f06333..29fd06cb93 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Door.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Door.java @@ -677,7 +677,7 @@ public class Door extends Creature @Override public String toString() { - return "door " + _doorId; + return getClass().getSimpleName() + "[" + _doorId + "](" + getObjectId() + ")"; } /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index 7fdd47efd8..1f10bc3714 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -337,7 +337,7 @@ public class VillageMaster extends Folk // Subclass exploit fix during add subclass if (!player.getClient().getFloodProtectors().canChangeSubclass()) { - LOGGER.warning("Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(player + " has performed a subclass change too fast"); player.setLocked(false); return; } @@ -438,7 +438,7 @@ public class VillageMaster extends Folk // Subclass exploit fix during change subclass if (!player.getClient().getFloodProtectors().canChangeSubclass()) { - LOGGER.warning("Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(player + " has performed a subclass change too fast"); player.setLocked(false); return; } @@ -499,7 +499,7 @@ public class VillageMaster extends Folk // Subclass exploit fix during delete subclass if (!player.getClient().getFloodProtectors().canChangeSubclass()) { - LOGGER.warning("Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(player + " has performed a subclass change too fast"); player.setLocked(false); return; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java index ad54e644c7..cd3eee6912 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -1243,7 +1243,7 @@ public class Item extends WorldObject @Override public String toString() { - return "" + _item; + return _item + "[" + getObjectId() + "]"; } /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java index 943f9f7416..89a2e77ff1 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java @@ -320,7 +320,7 @@ class OlympiadGame } catch (Exception e) { - LOGGER.warning("Olympiad System: Game - " + _stadiumID + " on player " + player.getName() + " removals, an error has been occurred: " + e); + LOGGER.warning("Olympiad System: Game - " + _stadiumID + " on " + player + " removals, an error has been occurred: " + e); } } } @@ -457,7 +457,7 @@ class OlympiadGame } catch (Exception e) { - LOGGER.warning("Olympiad System: Game - " + _stadiumID + " on player " + player.getName() + " additions, an error has been occurred: " + e); + LOGGER.warning("Olympiad System: Game - " + _stadiumID + " on " + player + " additions, an error has been occurred: " + e); } } } @@ -484,7 +484,7 @@ class OlympiadGame } catch (Exception e) { - LOGGER.warning("Olympiad System: Game - " + _stadiumID + " on player " + player.getName() + " sendMessage, an error has been occurred: " + e); + LOGGER.warning("Olympiad System: Game - " + _stadiumID + " on " + player + " sendMessage, an error has been occurred: " + e); } } } @@ -559,7 +559,7 @@ class OlympiadGame } catch (Exception e) { - LOGGER.warning("Olympiad System: Game - " + _stadiumID + " on player " + player.getName() + " PlayersStatusBack, an error has been occurred: " + e); + LOGGER.warning("Olympiad System: Game - " + _stadiumID + " on " + player + " PlayersStatusBack, an error has been occurred: " + e); } } } @@ -904,7 +904,7 @@ class OlympiadGame } catch (Exception e) { - LOGGER.warning("Olympiad System: Game - " + _stadiumID + " on player " + player.getName() + " makeCompetitionStart, an error has been occurred: " + e); + LOGGER.warning("Olympiad System: Game - " + _stadiumID + " on " + player + " makeCompetitionStart, an error has been occurred: " + e); _aborted = true; } } @@ -1039,7 +1039,7 @@ class OlympiadGameTask implements Runnable { if ((player != null) && player.inObserverMode()) { - LOGGER.info("[OLYMPIAD DEBUG] Player " + player.getName() + "is in Observer mode!"); + LOGGER.info("[OLYMPIAD DEBUG] " + player + "is in Observer mode!"); return true; } return false; @@ -1077,7 +1077,7 @@ class OlympiadGameTask implements Runnable player.sendPacket(new ExOlympiadMode(2, player)); player.broadcastUserInfo(); - LOGGER.info("[OLYMPIAD DEBUG] Player " + player.getName() + "was on observer mode! Status restored!"); + LOGGER.info("[OLYMPIAD DEBUG] " + player + "was on observer mode! Status restored!"); } protected boolean checkBattleStatus() diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 16a2d6bc77..51cf0baddb 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -246,7 +246,7 @@ public class EnterWorld implements IClientIncomingPacket // Message with screen player.sendPacket(new ExShowScreenMessage(" You have an over enchanted item, you will be kicked from server! ", 6000)); // Punishment e LOGGER in audit - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " has Overenchanted item! Kicked! ", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " has overenchanted item! Kicked! ", Config.DEFAULT_PUNISH); // Logger in console PacketLogger.info("#### ATTENTION ####"); PacketLogger.info(i + " item has been removed from " + player); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index daeefd9a4f..b7969b97bc 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -63,7 +63,7 @@ public class MoveBackwardToLocation implements IClientIncomingPacket { final Player player = client.getPlayer(); player.sendPacket(SystemMessageId.A_HACKING_TOOL_HAS_BEEN_DISCOVERED_PLEASE_TRY_PLAYING_AGAIN_AFTER_CLOSING_UNNECESSARY_PROGRAMS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " trying to use L2Walker!", IllegalPlayerAction.PUNISH_KICK); + Util.handleIllegalPlayerAction(player, player + " trying to use L2Walker!", IllegalPlayerAction.PUNISH_KICK); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java index bf437745bd..8ce344f7f8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java @@ -107,8 +107,8 @@ public class RequestAquireSkill implements IClientIncomingPacket if ((counts == 0) && !Config.ALT_GAME_SKILL_LEARN) { - player.sendMessage("You are trying to learn skill that u can't.."); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to learn skill that he can't!!!", IllegalPlayerAction.PUNISH_KICK); + player.sendMessage("You are trying to learn skill that you can't..."); + Util.handleIllegalPlayerAction(player, player + " tried to learn skill that he can't!!!", IllegalPlayerAction.PUNISH_KICK); return; } @@ -167,8 +167,8 @@ public class RequestAquireSkill implements IClientIncomingPacket if (counts == 0) { - player.sendMessage("You are trying to learn skill that u can't.."); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to learn skill that he can't!!!", IllegalPlayerAction.PUNISH_KICK); + player.sendMessage("You are trying to learn skill that you can't.."); + Util.handleIllegalPlayerAction(player, player + " tried to learn skill that he can't!!!", IllegalPlayerAction.PUNISH_KICK); return; } @@ -219,8 +219,8 @@ public class RequestAquireSkill implements IClientIncomingPacket if (counts == 0) { - player.sendMessage("You are trying to learn skill that u can't.."); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to learn skill that he can't!!!", IllegalPlayerAction.PUNISH_KICK); + player.sendMessage("You are trying to learn skill that you can't.."); + Util.handleIllegalPlayerAction(player, player + " tried to learn skill that he can't!!!", IllegalPlayerAction.PUNISH_KICK); return; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index e23dce4d37..d498a904e9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -200,7 +200,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (item.isWear()) { player.setActiveEnchantItem(null); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant a weared Item", IllegalPlayerAction.PUNISH_KICK); + Util.handleIllegalPlayerAction(player, player + " tried to enchant a weared Item", IllegalPlayerAction.PUNISH_KICK); return; } @@ -591,7 +591,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (scroll == null) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a scroll he doesnt have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a scroll he doesnt have", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java index 1469afb5cb..b45e6cc59f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java @@ -120,8 +120,8 @@ public class RequestExEnchantSkill implements IClientIncomingPacket if ((counts == 0) && !Config.ALT_GAME_SKILL_LEARN) { - player.sendMessage("You are trying to learn skill that u can't.."); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to learn skill that he can't!!!", IllegalPlayerAction.PUNISH_KICK); + player.sendMessage("You are trying to learn skill that you can't..."); + Util.handleIllegalPlayerAction(player, player + " tried to learn skill that he can't!!!", IllegalPlayerAction.PUNISH_KICK); return; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index 5e03f50d47..f23ac3d20c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -62,7 +62,7 @@ public class RequestGetItemFromPet implements IClientIncomingPacket final Pet pet = (Pet) player.getPet(); if (player.getActiveEnchantItem() != null) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " Tried To Use Enchant Exploit , And Got Banned!", IllegalPlayerAction.PUNISH_KICKBAN); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant exploit and got banned!", IllegalPlayerAction.PUNISH_KICKBAN); return; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index ac063a6952..16febf2963 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -74,7 +74,7 @@ public class RequestGiveItemToPet implements IClientIncomingPacket if (player.getActiveEnchantItem() != null) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " Tried To Use Enchant Exploit And Got Banned!", IllegalPlayerAction.PUNISH_KICKBAN); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant exploit and got banned!", IllegalPlayerAction.PUNISH_KICKBAN); return; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java index ede953f93f..f3cfdb1f25 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java @@ -119,7 +119,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket { if ((ir.getCount() > Integer.MAX_VALUE) || (ir.getCount() < 0)) { - final String msgErr = "[RequestPrivateStoreBuy] player " + player.getName() + " tried an overflow exploit, ban this player!"; + final String msgErr = "[RequestPrivateStoreBuy] " + player + " tried an overflow exploit, ban this player!"; Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH); return; } @@ -127,14 +127,14 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket final TradeItem sellersItem = storeList.getItem(ir.getObjectId()); if (sellersItem == null) { - final String msgErr = "[RequestPrivateStoreBuy] player " + player.getName() + " tried to buy an item not sold in a private store (buy), ban this player!"; + final String msgErr = "[RequestPrivateStoreBuy] " + player + " tried to buy an item not sold in a private store (buy), ban this player!"; Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH); return; } if (ir.getPrice() != sellersItem.getPrice()) { - final String msgErr = "[RequestPrivateStoreBuy] player " + player.getName() + " tried to change the seller's price in a private store (buy), ban this player!"; + final String msgErr = "[RequestPrivateStoreBuy] " + player + " tried to change the seller's price in a private store (buy), ban this player!"; Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH); return; } @@ -157,7 +157,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket // FIXME: this check should be (and most probably is) done in the TradeList mechanics if ((priceTotal < 0) || (priceTotal > Integer.MAX_VALUE)) { - final String msgErr = "[RequestPrivateStoreBuy] player " + player.getName() + " tried an overflow exploit, ban this player!"; + final String msgErr = "[RequestPrivateStoreBuy] " + player + " tried an overflow exploit, ban this player!"; Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH); return; } @@ -180,7 +180,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket if ((storePlayer.getPrivateStoreType() == Player.STORE_PRIVATE_PACKAGE_SELL) && (storeList.getItemCount() > _count)) { - final String msgErr = "[RequestPrivateStoreBuy] player " + player.getName() + " tried to buy less items then sold by package-sell, ban this player for bot-usage!"; + final String msgErr = "[RequestPrivateStoreBuy] " + player + " tried to buy less items then sold by package-sell, ban this player for bot-usage!"; Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageBuy.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageBuy.java index cd4a96074b..19124e0448 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageBuy.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageBuy.java @@ -47,8 +47,8 @@ public class RequestPrivateStoreManageBuy implements IClientIncomingPacket // Fix for privatestore exploit during login if (!player.isSpawned() || player.isLocked()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " try exploit at login with privatestore!", Config.DEFAULT_PUNISH); - PacketLogger.warning("Player " + player.getName() + " try exploit at login with privatestore!"); + Util.handleIllegalPlayerAction(player, player + " try exploit at login with privatestore!", Config.DEFAULT_PUNISH); + PacketLogger.warning(player + " try exploit at login with privatestore!"); return; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java index 8505c47ce7..0a6198f3d7 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java @@ -47,8 +47,8 @@ public class RequestPrivateStoreManageSell implements IClientIncomingPacket // Fix for privatestore exploit during login if (!player.isSpawned() || player.isLocked()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " try exploit at login with privatestore!", Config.DEFAULT_PUNISH); - PacketLogger.warning("Player " + player.getName() + " try exploit at login with privatestore!"); + Util.handleIllegalPlayerAction(player, player + " try exploit at login with privatestore!", Config.DEFAULT_PUNISH); + PacketLogger.warning(player + " try exploit at login with privatestore!"); return; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java index fdb8ecc319..74f714d820 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java @@ -157,8 +157,8 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket if (!storeList.PrivateStoreSell(player, _items, _price)) { player.sendPacket(ActionFailed.STATIC_PACKET); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " provided invalid list or request! ", Config.DEFAULT_PUNISH); - PacketLogger.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + Util.handleIllegalPlayerAction(player, player + " provided invalid list or request! ", Config.DEFAULT_PUNISH); + PacketLogger.warning("PrivateStore sell has failed due to invalid list or request. " + player + ", Private store of " + storePlayer); return; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index ed5649e090..250a59cc0b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -69,7 +69,7 @@ public class RequestRestart implements IClientIncomingPacket // Check if player are changing class if (player.isLocked()) { - PacketLogger.warning("Player " + player.getName() + " tried to restart during class change."); + PacketLogger.warning(player + " tried to restart during class change."); player.sendPacket(RestartResponse.valueOf(false)); return; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 225dceeba3..16565057dc 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -162,7 +162,7 @@ public class Say2 implements IClientIncomingPacket if (Config.L2WALKER_PROTECTION && (chatType == ChatType.WHISPER) && checkBot(_text)) { - Util.handleIllegalPlayerAction(player, "Client Emulator Detect: Player " + player.getName() + " using l2walker.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Client Emulator Detect: " + player + " using L2Walker.", Config.DEFAULT_PUNISH); return; } _text = _text.replaceAll("\\\\n", ""); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java index 45114728f5..e4b7c33904 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java @@ -117,7 +117,7 @@ public class SetPrivateStoreListSell implements IClientIncomingPacket final int price = _items[(i * 3) + 2]; if (price <= 0) { - final String msgErr = "[SetPrivateStoreListSell] player " + player.getName() + " tried an overflow exploit (use PHX), ban this player!"; + final String msgErr = "[SetPrivateStoreListSell] " + player + " tried an overflow exploit (use PHX), ban this player!"; Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH); _count = 0; return; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/TradeDone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/TradeDone.java index 7b1ddce951..4d173db177 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/TradeDone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/TradeDone.java @@ -54,7 +54,7 @@ public class TradeDone implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - // LOGGER.warning("player.getTradeList == null in " + getType() + " for player " + player.getName()); + // LOGGER.warning("player.getTradeList == null in " + getType() + " for " + player); return; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 0fbc84775f..1b864bd881 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -286,7 +286,7 @@ public class UseItem implements IClientIncomingPacket if ((Config.MAX_ITEM_ENCHANT_KICK > 0) && !player.isGM() && (item.getEnchantLevel() > Config.MAX_ITEM_ENCHANT_KICK)) { player.sendMessage("You have been kicked for using an item overenchanted!"); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " has item Overenchanted! Kicked ", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " has item Overenchanted! Kicked ", Config.DEFAULT_PUNISH); // player.closeNetConnection(); return; } @@ -312,7 +312,7 @@ public class UseItem implements IClientIncomingPacket { // player.setAccountAccesslevel(-1); //ban player.sendMessage("You have been banned for using an item wich is over enchanted!"); // message - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " has item Overenchanted! ", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " has item Overenchanted! ", Config.DEFAULT_PUNISH); // player.closeNetConnection(); //kick return; } @@ -330,7 +330,7 @@ public class UseItem implements IClientIncomingPacket { // player.setAccountAccesslevel(-1); //ban player.sendMessage("You have been banned for using an item wich is over enchanted!"); // message - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " has item Overenchanted! ", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " has item Overenchanted! ", Config.DEFAULT_PUNISH); // player.closeNetConnection(); //kick return; } @@ -346,7 +346,7 @@ public class UseItem implements IClientIncomingPacket { // player.setAccountAccesslevel(-1); //ban player.sendMessage("You have been banned for using an item wich is over enchanted!"); // message - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " has item Overenchanted! ", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " has item Overenchanted! ", Config.DEFAULT_PUNISH); // player.closeNetConnection(); //kick return; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index c64f749876..90e2ae6fa6 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -70,7 +70,7 @@ public class SellListProcure implements IClientOutgoingPacket packet.writeD(entry.getValue()); // count packet.writeH(item.getItem().getType2()); packet.writeH(0); // unknown - packet.writeD(0); // price, u shouldnt get any adena for crops, only raw materials + packet.writeD(0); // price, you shouldnt get any adena for crops, only raw materials } return true; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java index 41bb339d05..46c787b7e9 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java @@ -364,7 +364,7 @@ public class TalentShow extends AbstractNpcAI { if ((event == null) || event.isEmpty()) { - LOGGER.warning("MC_Show: Null/Empty event for npc " + npc + " and player " + player + "!"); + LOGGER.warning("MC_Show: Null/Empty event for " + npc + " and " + player + "!"); return null; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/AvantGarde/AvantGarde.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/AvantGarde/AvantGarde.java index a37109f922..f73be5b59c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/AvantGarde/AvantGarde.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/AvantGarde/AvantGarde.java @@ -228,7 +228,7 @@ public class AvantGarde extends AbstractNpcAI } else { - LOGGER.warning("Invalid Sub-Class Skill Id: " + skillIdVar + " for player " + player.getName() + "!"); + LOGGER.warning("Invalid Sub-Class Skill Id: " + skillIdVar + " for " + player + "!"); } } else if (!qvar.isEmpty() && !qvar.equals("0")) @@ -258,7 +258,7 @@ public class AvantGarde extends AbstractNpcAI } else { - LOGGER.warning("Invalid item object Id: " + qvar + " for player " + player.getName() + "!"); + LOGGER.warning("Invalid item object Id: " + qvar + " for " + player + "!"); } } } @@ -275,7 +275,7 @@ public class AvantGarde extends AbstractNpcAI final Item item = player.getInventory().getItemByItemId(itemId); if (item != null) { - LOGGER.warning(getClass().getName() + ": player " + player + " had 'extra' certification skill books while cancelling sub-class certifications!"); + LOGGER.warning(getClass().getName() + ": " + player + " had 'extra' certification skill books while cancelling sub-class certifications!"); player.destroyItem("CancelCertificationExtraBooks", item, npc, false); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index 7291976b91..902ff3630c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -1439,7 +1439,7 @@ public class CastleChamberlain extends AbstractNpcAI } default: { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java index 8c20e580c0..b29402313d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java @@ -163,7 +163,7 @@ public class ManorManager extends AbstractNpcAI } default: { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/Validators/SubClassSkills.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/Validators/SubClassSkills.java index 8ac2837221..66efab1cab 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/Validators/SubClassSkills.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/Validators/SubClassSkills.java @@ -111,7 +111,7 @@ public class SubClassSkills extends AbstractNpcAI { for (Skill s : certSkills) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " has cert skill on subclass :" + s.getName() + "(" + s.getId() + "/" + s.getLevel() + "), class:" + ClassListData.getInstance().getClass(player.getClassId()).getClassName(), IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " has cert skill on subclass :" + s.getName() + "(" + s.getId() + "/" + s.getLevel() + "), class:" + ClassListData.getInstance().getClass(player.getClassId()).getClassName(), IllegalActionPunishmentType.NONE); if (Config.SKILL_CHECK_REMOVE) { player.removeSkill(s); @@ -268,11 +268,11 @@ public class SubClassSkills extends AbstractNpcAI { if (cSkills[i][1] == skill.getLevel()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " has invalid cert skill :" + skill.getName() + "(" + skill.getId() + "/" + skill.getLevel() + ")", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " has invalid cert skill :" + skill.getName() + "(" + skill.getId() + "/" + skill.getLevel() + ")", IllegalActionPunishmentType.NONE); } else { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " has invalid cert skill :" + skill.getName() + "(" + skill.getId() + "/" + skill.getLevel() + "), level too high", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " has invalid cert skill :" + skill.getName() + "(" + skill.getId() + "/" + skill.getLevel() + "), level too high", IllegalActionPunishmentType.NONE); } if (Config.SKILL_CHECK_REMOVE) diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java index 486cd65fa5..0fcb409294 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java @@ -126,7 +126,7 @@ public class SkillTransfer extends AbstractNpcAI if (count < 0) { final String className = ClassListData.getInstance().getClass(player.getClassId()).getClassName(); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " has too many transfered skills or items, skill:" + s.getName() + " (" + sk.getId() + "/" + sk.getLevel() + "), class:" + className, IllegalActionPunishmentType.BROADCAST); + Util.handleIllegalPlayerAction(player, player + " has too many transfered skills or items, skill:" + s.getName() + " (" + sk.getId() + "/" + sk.getLevel() + "), class:" + className, IllegalActionPunishmentType.BROADCAST); if (Config.SKILL_CHECK_REMOVE) { player.removeSkill(sk); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/Link.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/Link.java index fdd8c4a95d..f5bfe9c8d0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/Link.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/Link.java @@ -82,13 +82,13 @@ public class Link implements IBypassHandler final String htmlPath = command.substring(4).trim(); if (htmlPath.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty link html!"); + LOGGER.warning(player + " sent empty link html!"); return false; } if (htmlPath.contains("..")) { - LOGGER.warning("Player " + player.getName() + " sent invalid link html: " + htmlPath); + LOGGER.warning(player + " sent invalid link html: " + htmlPath); return false; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/communityboard/ClanBoard.java index 4fffee35d4..1a13264ab6 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/communityboard/ClanBoard.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/communityboard/ClanBoard.java @@ -77,7 +77,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanList(player, 1); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan list bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan list bypass " + command + "!"); } } } @@ -97,7 +97,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanHome(player); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan home bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan home bypass " + command + "!"); } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java index dc54e01a0b..df4f03d172 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java @@ -83,7 +83,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for " + player); } } else if (command.startsWith("bbs_add_fav")) @@ -110,7 +110,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for " + player); } } } @@ -134,7 +134,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for " + player); } } return true; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/communityboard/HomeBoard.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/communityboard/HomeBoard.java index 90e1911e9a..d42437cfc6 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/communityboard/HomeBoard.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/communityboard/HomeBoard.java @@ -328,7 +328,7 @@ public class HomeBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for " + player); } return count; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/communityboard/RegionBoard.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/communityboard/RegionBoard.java index 1f6e9fc62c..2e817aa4c3 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/communityboard/RegionBoard.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/communityboard/RegionBoard.java @@ -82,7 +82,7 @@ public class RegionBoard implements IWriteBoardHandler final String id = command.replace("_bbsloc;", ""); if (!Util.isDigit(id)) { - LOG.warning(RegionBoard.class.getSimpleName() + ": Player " + player + " sent and invalid region bypass " + command + "!"); + LOG.warning(RegionBoard.class.getSimpleName() + ": " + player + " sent and invalid region bypass " + command + "!"); return false; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java index d827f30453..a5a07abfb3 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java @@ -244,7 +244,7 @@ public class TerritoryWarSuperClass extends Quest } else { - LOGGER.warning("TerritoryWar: Missing Kill the quest for player " + player.getName() + " whose class id: " + player.getClassId().getId()); + LOGGER.warning("TerritoryWar: Missing Kill the quest for " + player + " whose class id: " + player.getClassId().getId()); } } } @@ -372,7 +372,7 @@ public class TerritoryWarSuperClass extends Quest } else { - LOGGER.warning("TerritoryWar: Missing Kill the quest for player " + player.getName() + " whose class id: " + player.getClassId().getId()); + LOGGER.warning("TerritoryWar: Missing Kill the quest for " + player + " whose class id: " + player.getClassId().getId()); } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 0958dc86ab..e0f39b009b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -239,7 +239,7 @@ public class MultisellData implements IXmlReader } else { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); return; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index c7203fb789..c729b91a54 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -99,7 +99,7 @@ public class AdminCommandHandler implements IHandler 0) { @@ -6973,7 +6973,7 @@ public class Player extends Playable // a possible restart-while-modifysubclass cheat has been attempted. // Switching to use base class player.setClassId(player.getBaseClass()); - LOGGER.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); + LOGGER.warning(player + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); } else { @@ -13688,12 +13688,12 @@ public class Player extends Playable if (nextLevel == -1) { - LOGGER.info("Removing skill " + skill + " from player " + toString()); + LOGGER.info("Removing skill " + skill + " from " + this); removeSkill(skill, true); // there is no lower skill } else { - LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString()); + LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for " + this); addSkill(SkillData.getInstance().getSkill(skill.getId(), nextLevel), true); // replace with lower one } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/Quest.java index 7f4b936df0..fabb3676ea 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -1430,7 +1430,7 @@ public class Quest extends AbstractScript implements IIdentifiable final Quest q = QuestManager.getInstance().getQuest(questId); if (q == null) { - LOGGER.finer("Unknown quest " + questId + " for player " + player.getName()); + LOGGER.finer("Unknown quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestData.setInt(1, player.getObjectId()); @@ -1461,7 +1461,7 @@ public class Quest extends AbstractScript implements IIdentifiable final QuestState qs = player.getQuestState(questId); if (qs == null) { - LOGGER.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); + LOGGER.finer("Lost variable " + var + " in quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestDataVar.setInt(1, player.getObjectId()); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index e4ecbe700d..53e3530035 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -62,7 +62,7 @@ public class MoveBackwardToLocation implements IClientIncomingPacket if (Config.L2WALKER_PROTECTION) { final Player player = client.getPlayer(); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is trying to use L2Walker and got kicked.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " is trying to use L2Walker and got kicked.", Config.DEFAULT_PUNISH); } } return true; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index 6b4d3c4e15..ce9f99f42b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -110,7 +110,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level); if (skill == null) { - PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": " + player + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -126,7 +126,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { // The previous level skill has not been learned. player.sendPacket(SystemMessageId.THE_PREVIOUS_LEVEL_SKILL_HAS_NOT_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } } @@ -153,7 +153,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!canTransform(player)) { player.sendPacket(SystemMessageId.YOU_HAVE_NOT_COMPLETED_THE_NECESSARY_QUEST_FOR_SKILL_ACQUISITION); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); return; } @@ -237,7 +237,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!clan.isLearnableSubPledgeSkill(skill, _subType)) { player.sendPacket(SystemMessageId.THIS_SQUAD_SKILL_HAS_ALREADY_BEEN_ACQUIRED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } @@ -290,7 +290,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUB_CLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -299,7 +299,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { // The previous level skill has not been learned. player.sendPacket(SystemMessageId.THE_PREVIOUS_LEVEL_SKILL_HAS_NOT_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } @@ -313,7 +313,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket } else { - PacketLogger.warning("Null SubClassSkills quest, for Sub-Class skill Id: " + _id + " level: " + _level + " for player " + player.getName() + "!"); + PacketLogger.warning("Null SubClassSkills quest, for Sub-Class skill Id: " + _id + " level: " + _level + " for " + player + "!"); return; } } @@ -347,12 +347,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket } else { - PacketLogger.warning("Inexistent item for object Id " + itemObjId + ", for Sub-Class skill Id: " + _id + " level: " + _level + " for player " + player.getName() + "!"); + PacketLogger.warning("Inexistent item for object Id " + itemObjId + ", for Sub-Class skill Id: " + _id + " level: " + _level + " for " + player + "!"); } } else { - PacketLogger.warning("Invalid item object Id " + itemOID + ", for Sub-Class skill Id: " + _id + " level: " + _level + " for player " + player.getName() + "!"); + PacketLogger.warning("Invalid item object Id " + itemOID + ", for Sub-Class skill Id: " + _id + " level: " + _level + " for " + player + "!"); } } } @@ -420,7 +420,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (skillLearn.getGetLevel() > player.getLevel()) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_SKILL_LEVEL_REQUIREMENTS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); return false; } @@ -479,7 +479,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { if (!player.destroyItemByItemId("SkillLearn", itemIdCount.getId(), itemIdCount.getCount(), trainer, true)) { - Util.handleIllegalPlayerAction(player, "Somehow player " + player.getName() + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, "Somehow " + player + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index 1a6d625273..b4967a9ebf 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -126,7 +126,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { player.sendPacket(ActionFailed.STATIC_PACKET); - PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().getId()); + PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().getId()); return; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index f1c9d8d6ac..5873e6332e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -84,7 +84,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning(player + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -254,7 +254,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (Exception e) { - PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _command + " " + e.getMessage()); + PacketLogger.warning("Exception processing bypass from " + player + ": " + _command + " " + e.getMessage()); if (player.isGM()) { final StringBuilder sb = new StringBuilder(200); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 16ab19e954..4e320fd38a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -71,7 +71,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to cancel not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to cancel not own post!", Config.DEFAULT_PUNISH); return; } @@ -123,19 +123,19 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items not from mail !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items not from mail !", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java index 48148e7c31..8ff126cf8f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java @@ -77,7 +77,7 @@ public class RequestDeleteReceivedPost implements IClientIncomingPacket } if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java index 88fd8b949d..c4d3846ad7 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java @@ -77,7 +77,7 @@ public class RequestDeleteSentPost implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index ad8030eaee..3992bacbfc 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -120,7 +120,7 @@ public class RequestEnchantItem implements IClientIncomingPacket // fast auto-enchant cheat check if ((player.getActiveEnchantTimestamp() == 0) || ((Chronos.currentTimeMillis() - player.getActiveEnchantTimestamp()) < 2000)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " use autoenchant program ", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.setActiveEnchantItemId(Player.ID_NONE); player.sendPacket(new EnchantResult(2, 0, 0)); return; @@ -131,7 +131,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (scroll == null) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); player.setActiveEnchantItemId(Player.ID_NONE); player.sendPacket(new EnchantResult(2, 0, 0)); return; @@ -144,7 +144,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (support == null) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); player.setActiveEnchantItemId(Player.ID_NONE); player.sendPacket(new EnchantResult(2, 0, 0)); return; @@ -331,7 +331,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", item, player, null) == null) { // unable to destroy item, cheater ? - Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from player " + player.getName() + ", possible cheater !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from " + player + ", possible cheater !", Config.DEFAULT_PUNISH); player.setActiveEnchantItemId(Player.ID_NONE); player.sendPacket(new EnchantResult(2, 0, 0)); if (Config.LOG_ITEM_ENCHANTS) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index 8f86baceec..6735886512 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -127,7 +127,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket default: { player.setActiveEnchantAttrItemId(Player.ID_NONE); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } } @@ -163,7 +163,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket if (elm.getElement() == opositeElement) { player.setActiveEnchantAttrItemId(Player.ID_NONE); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); return; } } @@ -186,7 +186,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket if (!player.destroyItem("AttrEnchant", stone, 1, player, true)) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to attribute enchant with a stone he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to attribute enchant with a stone he doesn't have", Config.DEFAULT_PUNISH); player.setActiveEnchantAttrItemId(Player.ID_NONE); return; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java index e2ba6e74bc..eafe23e2a1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java @@ -104,7 +104,7 @@ public class RequestExEnchantSkillRouteChange implements IClientIncomingPacket } final int beforeEnchantSkillLevel = player.getSkillLevel(_skillId); - // do u have this skill enchanted? + // do you have this skill enchanted? if (beforeEnchantSkillLevel <= 100) { return; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 32ab3ef4ed..66d1611adf 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -67,7 +67,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning(getClass().getName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getName() + ": Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -87,7 +87,7 @@ public class RequestHennaEquip implements IClientIncomingPacket player.sendPacket(SystemMessageId.THE_SYMBOL_CANNOT_BE_DRAWN); if (!player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS) && !henna.isAllowedClass(player.getClassId())) { - Util.handleIllegalPlayerAction(player, "Exploit attempt: Character " + player.getName() + " of account " + player.getAccountName() + " tryed to add a forbidden henna.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Exploit attempt: " + player + " tryed to add a forbidden henna.", Config.DEFAULT_PUNISH); } player.sendPacket(ActionFailed.STATIC_PACKET); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 7253226656..0fb3a57829 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -53,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from " + player); } player.sendPacket(ActionFailed.STATIC_PACKET); return; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 7c1c9fbf6a..a8bc98d810 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -51,7 +51,7 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning(getClass().getName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getName() + ": Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index f51eec948c..b31caa1777 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -76,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " requested Henna Draw remove without any henna."); player.sendPacket(ActionFailed.STATIC_PACKET); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java index b09d18125e..472e52d770 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java @@ -51,20 +51,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty html link!"); + PacketLogger.warning(player + " sent empty html link!"); return; } if (_link.contains("..")) { - PacketLogger.warning("Player " + player.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning(player + " sent invalid html link: link " + _link); return; } final int htmlObjectId = player.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - PacketLogger.warning("Player " + player.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning(player + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 9d5da9e660..7720aee22e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -95,7 +95,7 @@ public class RequestPackageSend implements IClientIncomingPacket if (player.getActiveEnchantItemId() != Player.ID_NONE) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 92c8e7d76c..2b6f9f82fc 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -110,7 +110,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own attachment!", Config.DEFAULT_PUNISH); return; } @@ -137,19 +137,19 @@ public class RequestPostAttachment implements IClientIncomingPacket // Calculate needed slots if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } @@ -196,7 +196,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java index caa2639793..8156deae96 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java @@ -131,7 +131,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket if ((storePlayer.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL) && (storeList.getItemCount() > _items.size())) { - final String msgErr = "[RequestPrivateStoreBuy] player " + player.getName() + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; + final String msgErr = "[RequestPrivateStoreBuy] " + player + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java index 6ffcc69313..cbf78835a6 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java @@ -65,7 +65,7 @@ public class RequestReceivedPost implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to receive not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to receive not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java index 07996c5c4a..90d4fc84b2 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java @@ -109,13 +109,13 @@ public class RequestRecipeShopListSet implements IClientIncomingPacket final RecipeList list = RecipeData.getInstance().getRecipeList(i.getRecipeId()); 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); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set recipe which he does not have.", Config.DEFAULT_PUNISH); return; } if (i.getCost() > MAX_ADENA) { - Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to set price more than " + MAX_ADENA + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set price more than " + MAX_ADENA + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java index 55c75f0292..ac8373ebdf 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java @@ -49,7 +49,7 @@ public class RequestRecipeShopMessageSet implements IClientIncomingPacket if ((_name != null) && (_name.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java index 556e16f090..18709b4e0c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java @@ -76,7 +76,7 @@ public class RequestRejectPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index 8e5a43faa9..bc4a35676b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -71,7 +71,7 @@ public class RequestRestart implements IClientIncomingPacket if (player.isChangingClass()) { - PacketLogger.warning("Player " + player.getName() + " tried to restart during class change."); + PacketLogger.warning(player + " tried to restart during class change."); player.sendPacket(RestartResponse.valueOf(false)); player.sendPacket(ActionFailed.STATIC_PACKET); return; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java index 1cf200da52..9f4036d402 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java @@ -64,7 +64,7 @@ public class RequestSentPost implements IClientIncomingPacket if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to read not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to read not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index a3a3d850c2..ffee840a04 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -135,7 +135,7 @@ public class Say2 implements IClientIncomingPacket if (Config.L2WALKER_PROTECTION && (chatType == ChatType.WHISPER) && checkBot(_text)) { - Util.handleIllegalPlayerAction(player, "Client Emulator Detect: Player " + player.getName() + " using l2walker.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Client Emulator Detect: " + player + " using L2Walker.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 608a8e9c1b..67eba69446 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -111,7 +111,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket if (player.getActiveEnchantItemId() != Player.ID_NONE) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java index 76e8ac2a68..89261d5490 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java index d86bfc8f84..88e04641cf 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java index 2726f99c08..38de85007e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java @@ -50,7 +50,7 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket if ((_msg != null) && (_msg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 13ef62f55f..db6c5307ee 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -61,7 +61,7 @@ public class SellListProcure implements IClientOutgoingPacket packet.writeQ(entry.getValue()); // count packet.writeH(item.getItem().getType2()); packet.writeH(0); // unknown - packet.writeQ(0); // price, u shouldnt get any adena for crops, only raw materials + packet.writeQ(0); // price, you shouldnt get any adena for crops, only raw materials } return true; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/Evolve.java index 5c688249e5..cb1e0d7786 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/Evolve.java @@ -62,7 +62,7 @@ public class Evolve final Pet currentPet = (Pet) player.getSummon(); if (currentPet.isAlikeDead()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java index 41bb339d05..46c787b7e9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java @@ -364,7 +364,7 @@ public class TalentShow extends AbstractNpcAI { if ((event == null) || event.isEmpty()) { - LOGGER.warning("MC_Show: Null/Empty event for npc " + npc + " and player " + player + "!"); + LOGGER.warning("MC_Show: Null/Empty event for " + npc + " and " + player + "!"); return null; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/AvantGarde.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/AvantGarde.java index a37109f922..f73be5b59c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/AvantGarde.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/AvantGarde.java @@ -228,7 +228,7 @@ public class AvantGarde extends AbstractNpcAI } else { - LOGGER.warning("Invalid Sub-Class Skill Id: " + skillIdVar + " for player " + player.getName() + "!"); + LOGGER.warning("Invalid Sub-Class Skill Id: " + skillIdVar + " for " + player + "!"); } } else if (!qvar.isEmpty() && !qvar.equals("0")) @@ -258,7 +258,7 @@ public class AvantGarde extends AbstractNpcAI } else { - LOGGER.warning("Invalid item object Id: " + qvar + " for player " + player.getName() + "!"); + LOGGER.warning("Invalid item object Id: " + qvar + " for " + player + "!"); } } } @@ -275,7 +275,7 @@ public class AvantGarde extends AbstractNpcAI final Item item = player.getInventory().getItemByItemId(itemId); if (item != null) { - LOGGER.warning(getClass().getName() + ": player " + player + " had 'extra' certification skill books while cancelling sub-class certifications!"); + LOGGER.warning(getClass().getName() + ": " + player + " had 'extra' certification skill books while cancelling sub-class certifications!"); player.destroyItem("CancelCertificationExtraBooks", item, npc, false); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index 7291976b91..902ff3630c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -1439,7 +1439,7 @@ public class CastleChamberlain extends AbstractNpcAI } default: { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java index 8c20e580c0..b29402313d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java @@ -163,7 +163,7 @@ public class ManorManager extends AbstractNpcAI } default: { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/Validators/SubClassSkills.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/Validators/SubClassSkills.java index 8ac2837221..66efab1cab 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/Validators/SubClassSkills.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/Validators/SubClassSkills.java @@ -111,7 +111,7 @@ public class SubClassSkills extends AbstractNpcAI { for (Skill s : certSkills) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " has cert skill on subclass :" + s.getName() + "(" + s.getId() + "/" + s.getLevel() + "), class:" + ClassListData.getInstance().getClass(player.getClassId()).getClassName(), IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " has cert skill on subclass :" + s.getName() + "(" + s.getId() + "/" + s.getLevel() + "), class:" + ClassListData.getInstance().getClass(player.getClassId()).getClassName(), IllegalActionPunishmentType.NONE); if (Config.SKILL_CHECK_REMOVE) { player.removeSkill(s); @@ -268,11 +268,11 @@ public class SubClassSkills extends AbstractNpcAI { if (cSkills[i][1] == skill.getLevel()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " has invalid cert skill :" + skill.getName() + "(" + skill.getId() + "/" + skill.getLevel() + ")", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " has invalid cert skill :" + skill.getName() + "(" + skill.getId() + "/" + skill.getLevel() + ")", IllegalActionPunishmentType.NONE); } else { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " has invalid cert skill :" + skill.getName() + "(" + skill.getId() + "/" + skill.getLevel() + "), level too high", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " has invalid cert skill :" + skill.getName() + "(" + skill.getId() + "/" + skill.getLevel() + "), level too high", IllegalActionPunishmentType.NONE); } if (Config.SKILL_CHECK_REMOVE) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java index 486cd65fa5..0fcb409294 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java @@ -126,7 +126,7 @@ public class SkillTransfer extends AbstractNpcAI if (count < 0) { final String className = ClassListData.getInstance().getClass(player.getClassId()).getClassName(); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " has too many transfered skills or items, skill:" + s.getName() + " (" + sk.getId() + "/" + sk.getLevel() + "), class:" + className, IllegalActionPunishmentType.BROADCAST); + Util.handleIllegalPlayerAction(player, player + " has too many transfered skills or items, skill:" + s.getName() + " (" + sk.getId() + "/" + sk.getLevel() + "), class:" + className, IllegalActionPunishmentType.BROADCAST); if (Config.SKILL_CHECK_REMOVE) { player.removeSkill(sk); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Link.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Link.java index fdd8c4a95d..f5bfe9c8d0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Link.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Link.java @@ -82,13 +82,13 @@ public class Link implements IBypassHandler final String htmlPath = command.substring(4).trim(); if (htmlPath.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty link html!"); + LOGGER.warning(player + " sent empty link html!"); return false; } if (htmlPath.contains("..")) { - LOGGER.warning("Player " + player.getName() + " sent invalid link html: " + htmlPath); + LOGGER.warning(player + " sent invalid link html: " + htmlPath); return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/ClanBoard.java index 4fffee35d4..1a13264ab6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/ClanBoard.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/ClanBoard.java @@ -77,7 +77,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanList(player, 1); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan list bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan list bypass " + command + "!"); } } } @@ -97,7 +97,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanHome(player); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan home bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan home bypass " + command + "!"); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java index dc54e01a0b..df4f03d172 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java @@ -83,7 +83,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for " + player); } } else if (command.startsWith("bbs_add_fav")) @@ -110,7 +110,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for " + player); } } } @@ -134,7 +134,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for " + player); } } return true; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/HomeBoard.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/HomeBoard.java index 1dd757b67f..d4fbd74004 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/HomeBoard.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/HomeBoard.java @@ -326,7 +326,7 @@ public class HomeBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for " + player); } return count; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/RegionBoard.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/RegionBoard.java index 1f6e9fc62c..2e817aa4c3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/RegionBoard.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/RegionBoard.java @@ -82,7 +82,7 @@ public class RegionBoard implements IWriteBoardHandler final String id = command.replace("_bbsloc;", ""); if (!Util.isDigit(id)) { - LOG.warning(RegionBoard.class.getSimpleName() + ": Player " + player + " sent and invalid region bypass " + command + "!"); + LOG.warning(RegionBoard.class.getSimpleName() + ": " + player + " sent and invalid region bypass " + command + "!"); return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java index d827f30453..a5a07abfb3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java @@ -244,7 +244,7 @@ public class TerritoryWarSuperClass extends Quest } else { - LOGGER.warning("TerritoryWar: Missing Kill the quest for player " + player.getName() + " whose class id: " + player.getClassId().getId()); + LOGGER.warning("TerritoryWar: Missing Kill the quest for " + player + " whose class id: " + player.getClassId().getId()); } } } @@ -372,7 +372,7 @@ public class TerritoryWarSuperClass extends Quest } else { - LOGGER.warning("TerritoryWar: Missing Kill the quest for player " + player.getName() + " whose class id: " + player.getClassId().getId()); + LOGGER.warning("TerritoryWar: Missing Kill the quest for " + player + " whose class id: " + player.getClassId().getId()); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 0958dc86ab..e0f39b009b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -239,7 +239,7 @@ public class MultisellData implements IXmlReader } else { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); return; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index c7203fb789..c729b91a54 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -99,7 +99,7 @@ public class AdminCommandHandler implements IHandler 0) { @@ -6865,7 +6865,7 @@ public class Player extends Playable // a possible restart-while-modifysubclass cheat has been attempted. // Switching to use base class player.setClassId(player.getBaseClass()); - LOGGER.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); + LOGGER.warning(player + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); } else { @@ -13582,12 +13582,12 @@ public class Player extends Playable if (nextLevel == -1) { - LOGGER.info("Removing skill " + skill + " from player " + toString()); + LOGGER.info("Removing skill " + skill + " from " + this); removeSkill(skill, true); // there is no lower skill } else { - LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString()); + LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for " + this); addSkill(SkillData.getInstance().getSkill(skill.getId(), nextLevel), true); // replace with lower one } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/Quest.java index 4ea1abb217..d22719fd7c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -1468,7 +1468,7 @@ public class Quest extends AbstractScript implements IIdentifiable final Quest q = QuestManager.getInstance().getQuest(questId); if (q == null) { - LOGGER.finer("Unknown quest " + questId + " for player " + player.getName()); + LOGGER.finer("Unknown quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestData.setInt(1, player.getObjectId()); @@ -1499,7 +1499,7 @@ public class Quest extends AbstractScript implements IIdentifiable final QuestState qs = player.getQuestState(questId); if (qs == null) { - LOGGER.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); + LOGGER.finer("Lost variable " + var + " in quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestDataVar.setInt(1, player.getObjectId()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index e4ecbe700d..53e3530035 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -62,7 +62,7 @@ public class MoveBackwardToLocation implements IClientIncomingPacket if (Config.L2WALKER_PROTECTION) { final Player player = client.getPlayer(); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is trying to use L2Walker and got kicked.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " is trying to use L2Walker and got kicked.", Config.DEFAULT_PUNISH); } } return true; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index 6b4d3c4e15..ce9f99f42b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -110,7 +110,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level); if (skill == null) { - PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": " + player + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -126,7 +126,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { // The previous level skill has not been learned. player.sendPacket(SystemMessageId.THE_PREVIOUS_LEVEL_SKILL_HAS_NOT_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } } @@ -153,7 +153,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!canTransform(player)) { player.sendPacket(SystemMessageId.YOU_HAVE_NOT_COMPLETED_THE_NECESSARY_QUEST_FOR_SKILL_ACQUISITION); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); return; } @@ -237,7 +237,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!clan.isLearnableSubPledgeSkill(skill, _subType)) { player.sendPacket(SystemMessageId.THIS_SQUAD_SKILL_HAS_ALREADY_BEEN_ACQUIRED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } @@ -290,7 +290,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUB_CLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -299,7 +299,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { // The previous level skill has not been learned. player.sendPacket(SystemMessageId.THE_PREVIOUS_LEVEL_SKILL_HAS_NOT_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } @@ -313,7 +313,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket } else { - PacketLogger.warning("Null SubClassSkills quest, for Sub-Class skill Id: " + _id + " level: " + _level + " for player " + player.getName() + "!"); + PacketLogger.warning("Null SubClassSkills quest, for Sub-Class skill Id: " + _id + " level: " + _level + " for " + player + "!"); return; } } @@ -347,12 +347,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket } else { - PacketLogger.warning("Inexistent item for object Id " + itemObjId + ", for Sub-Class skill Id: " + _id + " level: " + _level + " for player " + player.getName() + "!"); + PacketLogger.warning("Inexistent item for object Id " + itemObjId + ", for Sub-Class skill Id: " + _id + " level: " + _level + " for " + player + "!"); } } else { - PacketLogger.warning("Invalid item object Id " + itemOID + ", for Sub-Class skill Id: " + _id + " level: " + _level + " for player " + player.getName() + "!"); + PacketLogger.warning("Invalid item object Id " + itemOID + ", for Sub-Class skill Id: " + _id + " level: " + _level + " for " + player + "!"); } } } @@ -420,7 +420,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (skillLearn.getGetLevel() > player.getLevel()) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_SKILL_LEVEL_REQUIREMENTS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); return false; } @@ -479,7 +479,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { if (!player.destroyItemByItemId("SkillLearn", itemIdCount.getId(), itemIdCount.getCount(), trainer, true)) { - Util.handleIllegalPlayerAction(player, "Somehow player " + player.getName() + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, "Somehow " + player + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index 693ab357c5..8d951f50fd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -129,7 +129,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { player.sendPacket(ActionFailed.STATIC_PACKET); - PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().getId()); + PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().getId()); return; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index be91a8e528..01041a2fdc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -83,7 +83,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning(player + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -258,7 +258,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (Exception e) { - PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _command + " " + e.getMessage()); + PacketLogger.warning("Exception processing bypass from " + player + ": " + _command + " " + e.getMessage()); if (player.isGM()) { final StringBuilder sb = new StringBuilder(200); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 16ab19e954..4e320fd38a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -71,7 +71,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to cancel not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to cancel not own post!", Config.DEFAULT_PUNISH); return; } @@ -123,19 +123,19 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items not from mail !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items not from mail !", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java index 48148e7c31..8ff126cf8f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java @@ -77,7 +77,7 @@ public class RequestDeleteReceivedPost implements IClientIncomingPacket } if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java index 88fd8b949d..c4d3846ad7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java @@ -77,7 +77,7 @@ public class RequestDeleteSentPost implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index ad8030eaee..3992bacbfc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -120,7 +120,7 @@ public class RequestEnchantItem implements IClientIncomingPacket // fast auto-enchant cheat check if ((player.getActiveEnchantTimestamp() == 0) || ((Chronos.currentTimeMillis() - player.getActiveEnchantTimestamp()) < 2000)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " use autoenchant program ", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.setActiveEnchantItemId(Player.ID_NONE); player.sendPacket(new EnchantResult(2, 0, 0)); return; @@ -131,7 +131,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (scroll == null) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); player.setActiveEnchantItemId(Player.ID_NONE); player.sendPacket(new EnchantResult(2, 0, 0)); return; @@ -144,7 +144,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (support == null) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); player.setActiveEnchantItemId(Player.ID_NONE); player.sendPacket(new EnchantResult(2, 0, 0)); return; @@ -331,7 +331,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", item, player, null) == null) { // unable to destroy item, cheater ? - Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from player " + player.getName() + ", possible cheater !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from " + player + ", possible cheater !", Config.DEFAULT_PUNISH); player.setActiveEnchantItemId(Player.ID_NONE); player.sendPacket(new EnchantResult(2, 0, 0)); if (Config.LOG_ITEM_ENCHANTS) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index a18fd0f88e..04fda7b47d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -115,7 +115,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket default: { player.setActiveEnchantAttrItemId(Player.ID_NONE); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } } @@ -147,7 +147,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket if (elm.getElement() == opositeElement) { player.setActiveEnchantAttrItemId(Player.ID_NONE); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); return; } } @@ -170,7 +170,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket if (!player.destroyItem("AttrEnchant", stone, 1, player, true)) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to attribute enchant with a stone he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to attribute enchant with a stone he doesn't have", Config.DEFAULT_PUNISH); player.setActiveEnchantAttrItemId(Player.ID_NONE); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java index e2ba6e74bc..eafe23e2a1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java @@ -104,7 +104,7 @@ public class RequestExEnchantSkillRouteChange implements IClientIncomingPacket } final int beforeEnchantSkillLevel = player.getSkillLevel(_skillId); - // do u have this skill enchanted? + // do you have this skill enchanted? if (beforeEnchantSkillLevel <= 100) { return; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 32ab3ef4ed..66d1611adf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -67,7 +67,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning(getClass().getName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getName() + ": Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -87,7 +87,7 @@ public class RequestHennaEquip implements IClientIncomingPacket player.sendPacket(SystemMessageId.THE_SYMBOL_CANNOT_BE_DRAWN); if (!player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS) && !henna.isAllowedClass(player.getClassId())) { - Util.handleIllegalPlayerAction(player, "Exploit attempt: Character " + player.getName() + " of account " + player.getAccountName() + " tryed to add a forbidden henna.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Exploit attempt: " + player + " tryed to add a forbidden henna.", Config.DEFAULT_PUNISH); } player.sendPacket(ActionFailed.STATIC_PACKET); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 7253226656..0fb3a57829 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -53,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from " + player); } player.sendPacket(ActionFailed.STATIC_PACKET); return; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 7c1c9fbf6a..a8bc98d810 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -51,7 +51,7 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning(getClass().getName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getName() + ": Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index f51eec948c..b31caa1777 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -76,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " requested Henna Draw remove without any henna."); player.sendPacket(ActionFailed.STATIC_PACKET); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java index b09d18125e..472e52d770 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java @@ -51,20 +51,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty html link!"); + PacketLogger.warning(player + " sent empty html link!"); return; } if (_link.contains("..")) { - PacketLogger.warning("Player " + player.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning(player + " sent invalid html link: link " + _link); return; } final int htmlObjectId = player.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - PacketLogger.warning("Player " + player.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning(player + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 9d5da9e660..7720aee22e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -95,7 +95,7 @@ public class RequestPackageSend implements IClientIncomingPacket if (player.getActiveEnchantItemId() != Player.ID_NONE) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 92c8e7d76c..2b6f9f82fc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -110,7 +110,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own attachment!", Config.DEFAULT_PUNISH); return; } @@ -137,19 +137,19 @@ public class RequestPostAttachment implements IClientIncomingPacket // Calculate needed slots if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } @@ -196,7 +196,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java index caa2639793..8156deae96 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java @@ -131,7 +131,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket if ((storePlayer.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL) && (storeList.getItemCount() > _items.size())) { - final String msgErr = "[RequestPrivateStoreBuy] player " + player.getName() + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; + final String msgErr = "[RequestPrivateStoreBuy] " + player + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java index 6ffcc69313..cbf78835a6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java @@ -65,7 +65,7 @@ public class RequestReceivedPost implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to receive not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to receive not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java index 07996c5c4a..90d4fc84b2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java @@ -109,13 +109,13 @@ public class RequestRecipeShopListSet implements IClientIncomingPacket final RecipeList list = RecipeData.getInstance().getRecipeList(i.getRecipeId()); 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); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set recipe which he does not have.", Config.DEFAULT_PUNISH); return; } if (i.getCost() > MAX_ADENA) { - Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to set price more than " + MAX_ADENA + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set price more than " + MAX_ADENA + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java index 55c75f0292..ac8373ebdf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java @@ -49,7 +49,7 @@ public class RequestRecipeShopMessageSet implements IClientIncomingPacket if ((_name != null) && (_name.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java index 556e16f090..18709b4e0c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java @@ -76,7 +76,7 @@ public class RequestRejectPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index 3984d3cfad..647821931b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -71,7 +71,7 @@ public class RequestRestart implements IClientIncomingPacket if (player.isChangingClass()) { - PacketLogger.warning("Player " + player.getName() + " tried to restart during class change."); + PacketLogger.warning(player + " tried to restart during class change."); player.sendPacket(RestartResponse.valueOf(false)); player.sendPacket(ActionFailed.STATIC_PACKET); return; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java index 1cf200da52..9f4036d402 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java @@ -64,7 +64,7 @@ public class RequestSentPost implements IClientIncomingPacket if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to read not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to read not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index a3a3d850c2..ffee840a04 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -135,7 +135,7 @@ public class Say2 implements IClientIncomingPacket if (Config.L2WALKER_PROTECTION && (chatType == ChatType.WHISPER) && checkBot(_text)) { - Util.handleIllegalPlayerAction(player, "Client Emulator Detect: Player " + player.getName() + " using l2walker.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Client Emulator Detect: " + player + " using L2Walker.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 608a8e9c1b..67eba69446 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -111,7 +111,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket if (player.getActiveEnchantItemId() != Player.ID_NONE) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java index 76e8ac2a68..89261d5490 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java index d86bfc8f84..88e04641cf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java index 2726f99c08..38de85007e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java @@ -50,7 +50,7 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket if ((_msg != null) && (_msg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 13ef62f55f..db6c5307ee 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -61,7 +61,7 @@ public class SellListProcure implements IClientOutgoingPacket packet.writeQ(entry.getValue()); // count packet.writeH(item.getItem().getType2()); packet.writeH(0); // unknown - packet.writeQ(0); // price, u shouldnt get any adena for crops, only raw materials + packet.writeQ(0); // price, you shouldnt get any adena for crops, only raw materials } return true; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/Evolve.java index 5c688249e5..cb1e0d7786 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/Evolve.java @@ -62,7 +62,7 @@ public class Evolve final Pet currentPet = (Pet) player.getSummon(); if (currentPet.isAlikeDead()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index 1b1d654a3e..5d4876ea78 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -1247,7 +1247,7 @@ public class CastleChamberlain extends AbstractNpcAI } default: { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java index be9f7384bc..6b017fa8e1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java @@ -751,12 +751,12 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader if (newClass == null) { - LOGGER.warning(getClass().getSimpleName() + ": No new classId found for player " + player); + LOGGER.warning(getClass().getSimpleName() + ": No new classId found for " + player); return false; } else if (newClass == player.getClassId()) { - LOGGER.warning(getClass().getSimpleName() + ": New classId found for player " + player + " is exactly the same as the one he currently is!"); + LOGGER.warning(getClass().getSimpleName() + ": New classId found for " + player + " is exactly the same as the one he currently is!"); return false; } else if (checkIfClassChangeHasOptions(player)) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Link.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Link.java index 0615917ca4..380a9f1ae3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Link.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Link.java @@ -69,13 +69,13 @@ public class Link implements IBypassHandler final String htmlPath = command.substring(4).trim(); if (htmlPath.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty link html!"); + LOGGER.warning(player + " sent empty link html!"); return false; } if (htmlPath.contains("..")) { - LOGGER.warning("Player " + player.getName() + " sent invalid link html: " + htmlPath); + LOGGER.warning(player + " sent invalid link html: " + htmlPath); return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/communityboard/ClanBoard.java index 3bfdf86486..a205475a6c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/communityboard/ClanBoard.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/communityboard/ClanBoard.java @@ -77,7 +77,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanList(player, 1); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan list bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan list bypass " + command + "!"); } } } @@ -97,7 +97,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanHome(player); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan home bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan home bypass " + command + "!"); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java index dc54e01a0b..df4f03d172 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java @@ -83,7 +83,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for " + player); } } else if (command.startsWith("bbs_add_fav")) @@ -110,7 +110,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for " + player); } } } @@ -134,7 +134,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for " + player); } } return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/communityboard/HomeBoard.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/communityboard/HomeBoard.java index 8c035841d0..8f6320ffef 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/communityboard/HomeBoard.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/communityboard/HomeBoard.java @@ -337,7 +337,7 @@ public class HomeBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for " + player); } return count; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/communityboard/RegionBoard.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/communityboard/RegionBoard.java index 0c5abf5c5a..c6a4392f6a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/communityboard/RegionBoard.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/communityboard/RegionBoard.java @@ -80,7 +80,7 @@ public class RegionBoard implements IWriteBoardHandler final String id = command.replace("_bbsloc;", ""); if (!Util.isDigit(id)) { - LOG.warning(RegionBoard.class.getSimpleName() + ": Player " + player + " sent and invalid region bypass " + command + "!"); + LOG.warning(RegionBoard.class.getSimpleName() + ": " + player + " sent and invalid region bypass " + command + "!"); return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/instances/AbstractInstance.java index 06415e9d40..94c337f0df 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/instances/AbstractInstance.java @@ -124,7 +124,7 @@ public abstract class AbstractInstance extends AbstractNpcAI final InstanceTemplate template = manager.getInstanceTemplate(templateId); if (template == null) { - LOGGER.warning("Player " + player.getName() + " (" + player.getObjectId() + ") wants to create instance with unknown template id " + templateId + "!"); + LOGGER.warning(player + " wants to create instance with unknown template id " + templateId + "!"); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 73914d140e..e288979088 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -278,7 +278,7 @@ public class MultisellData implements IXmlReader } else { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); return; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index 34c26f1ed0..c9bd4ec11e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -99,7 +99,7 @@ public class AdminCommandHandler implements IHandler 0) { @@ -6618,7 +6618,7 @@ public class Player extends Playable // a possible restart-while-modifysubclass cheat has been attempted. // Switching to use base class player.setClassId(player.getBaseClass()); - LOGGER.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); + LOGGER.warning(player + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); } else { @@ -12680,12 +12680,12 @@ public class Player extends Playable if (nextLevel == -1) { - LOGGER.info("Removing skill " + skill + " from player " + toString()); + LOGGER.info("Removing skill " + skill + " from " + this); removeSkill(skill, true); // there is no lower skill } else { - LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString()); + LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for " + this); addSkill(SkillData.getInstance().getSkill(skill.getId(), nextLevel), true); // replace with lower one } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java index 19d0788708..64dd2adb7b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java @@ -81,7 +81,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -93,7 +93,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -104,7 +104,7 @@ public class Teleporter extends Npc // Check for required count of params. if (st.countTokens() != 2) { - LOGGER.warning("Player " + player.getObjectId() + " send unhandled teleport command: " + command); + LOGGER.warning(player + " send unhandled teleport command: " + command); return; } @@ -112,7 +112,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); + LOGGER.warning(player + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); return; } holder.doTeleport(player, this, parseNextInt(st, -1)); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index 5f8e3d9558..a49d1e71ff 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -532,7 +532,7 @@ public class VillageMaster extends Folk */ if (!player.getClient().getFloodProtectors().canChangeSubclass()) { - LOGGER.warning(VillageMaster.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(VillageMaster.class.getName() + ": " + player + " has performed a subclass change too fast"); return; } @@ -592,7 +592,7 @@ public class VillageMaster extends Folk */ if (!player.getClient().getFloodProtectors().canChangeSubclass()) { - LOGGER.warning(VillageMaster.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(VillageMaster.class.getName() + ": " + player + " has performed a subclass change too fast"); return; } @@ -672,7 +672,7 @@ public class VillageMaster extends Folk */ if (!player.getClient().getFloodProtectors().canChangeSubclass()) { - LOGGER.warning(VillageMaster.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(VillageMaster.class.getName() + ": " + player + " has performed a subclass change too fast"); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/Quest.java index 8c0fb71a38..1d464ba58a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -1561,7 +1561,7 @@ public class Quest extends AbstractScript implements IIdentifiable final Quest q = QuestManager.getInstance().getQuest(questId); if (q == null) { - LOGGER.finer("Unknown quest " + questId + " for player " + player.getName()); + LOGGER.finer("Unknown quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestData.setInt(1, player.getObjectId()); @@ -1592,7 +1592,7 @@ public class Quest extends AbstractScript implements IIdentifiable final QuestState qs = player.getQuestState(questId); if (qs == null) { - LOGGER.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); + LOGGER.finer("Lost variable " + var + " in quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestDataVar.setInt(1, player.getObjectId()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index 1c31ff4a11..eb1434ff89 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -135,7 +135,7 @@ public class TeleportHolder { if (isNoblesse() && !player.isNoble()) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } @@ -194,14 +194,14 @@ public class TeleportHolder { if (isNoblesse() && !player.isNoble()) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } final TeleportLocation loc = getLocation(locId); if (loc == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport location " + locId + " within list " + _name + "!"); + LOGGER.warning(player + " requested unknown teleport location " + locId + " within list " + _name + "!"); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index a1f5312090..978967ee23 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -120,7 +120,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": " + player + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -137,7 +137,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { // The previous level skill has not been learned. player.sendPacket(SystemMessageId.THE_PREVIOUS_LEVEL_SKILL_HAS_NOT_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } } @@ -164,7 +164,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!canTransform(player)) { player.sendPacket(SystemMessageId.YOU_HAVE_NOT_COMPLETED_THE_NECESSARY_QUEST_FOR_SKILL_ACQUISITION); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); return; } @@ -248,7 +248,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!clan.isLearnableSubPledgeSkill(skill, _subType)) { player.sendPacket(SystemMessageId.THIS_SQUAD_SKILL_HAS_ALREADY_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } @@ -310,7 +310,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -340,7 +340,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -563,7 +563,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (skillLearn.getGetLevel() > player.getLevel()) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_SKILL_LEVEL_REQUIREMENTS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); return false; } @@ -632,7 +632,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { if (!player.destroyItemByItemId("SkillLearn", itemIdCount.getId(), itemIdCount.getCount(), trainer, true)) { - Util.handleIllegalPlayerAction(player, "Somehow player " + player.getName() + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, "Somehow " + player + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index 6ac4cc7ca0..0b8b67f9a0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -91,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { player.sendPacket(ActionFailed.STATIC_PACKET); - PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index dd5c90fce2..eb3d8fc0b1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -88,7 +88,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning(player + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -290,7 +290,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (Exception e) { - PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _command + " " + e.getMessage()); + PacketLogger.warning("Exception processing bypass from " + player + ": " + _command + " " + e.getMessage()); if (player.isGM()) { final StringBuilder sb = new StringBuilder(200); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 5d4b260a76..90500671bf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -69,7 +69,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to cancel not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to cancel not own post!", Config.DEFAULT_PUNISH); return; } @@ -121,19 +121,19 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items not from mail !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items not from mail !", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 1491cb1bfb..6b1a8b5d37 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -89,7 +89,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info(player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java index 6d59e89936..8685cb4867 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java @@ -77,7 +77,7 @@ public class RequestDeleteReceivedPost implements IClientIncomingPacket } if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java index 88fd8b949d..c4d3846ad7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java @@ -77,7 +77,7 @@ public class RequestDeleteSentPost implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index fbff78ff4c..818ee153d5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -129,7 +129,7 @@ public class RequestEnchantItem implements IClientIncomingPacket // fast auto-enchant cheat check if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " use autoenchant program ", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -139,7 +139,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", scroll.getObjectId(), 1, player, item) == null) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -149,7 +149,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if ((support != null) && (player.getInventory().destroyItem("Enchant", support.getObjectId(), 1, player, item) == null)) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -354,7 +354,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", item, player, null) == null) { // unable to destroy item, cheater ? - Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from player " + player.getName() + ", possible cheater !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from " + player + ", possible cheater !", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); if (Config.LOG_ITEM_ENCHANTS) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index f6b8d47c50..6630088f2a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -126,7 +126,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket default: { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } } @@ -159,7 +159,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket if (attribute.getType() == opositeElement) { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); return; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java index dc903790d0..27ced7e5f8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java @@ -45,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - PacketLogger.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning(player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 29deb5bdc8..bb111e8c17 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -68,7 +68,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 7253226656..0fb3a57829 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -53,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from " + player); } player.sendPacket(ActionFailed.STATIC_PACKET); return; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 79db1768e6..044ebba720 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -51,7 +51,7 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index f51eec948c..b31caa1777 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -76,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " requested Henna Draw remove without any henna."); player.sendPacket(ActionFailed.STATIC_PACKET); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java index 2cdc066ead..f5713d967d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java @@ -50,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty html link!"); + PacketLogger.warning(player + " sent empty html link!"); return; } if (_link.contains("..")) { - PacketLogger.warning("Player " + player.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning(player + " sent invalid html link: link " + _link); return; } final int htmlObjectId = player.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - PacketLogger.warning("Player " + player.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning(player + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 14eb0ff29b..7570e3e5e2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -93,7 +93,7 @@ public class RequestPackageSend implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index e1e1402fb5..c3a945d274 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -108,7 +108,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own attachment!", Config.DEFAULT_PUNISH); return; } @@ -135,19 +135,19 @@ public class RequestPostAttachment implements IClientIncomingPacket // Calculate needed slots if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } @@ -194,7 +194,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java index 2ded12e55d..f70e24e74c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java @@ -135,7 +135,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket if ((storePlayer.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL) && (storeList.getItemCount() > _items.size())) { - final String msgErr = "[RequestPrivateStoreBuy] player " + player.getName() + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; + final String msgErr = "[RequestPrivateStoreBuy] " + player + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java index 6ffcc69313..cbf78835a6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java @@ -65,7 +65,7 @@ public class RequestReceivedPost implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to receive not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to receive not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java index fd6b816fde..04ca270c1d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java @@ -103,13 +103,13 @@ public class RequestRecipeShopListSet implements IClientIncomingPacket final RecipeList list = RecipeData.getInstance().getRecipeList(i.getRecipeId()); 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); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set recipe which he dont have.", Config.DEFAULT_PUNISH); return; } if (i.getCost() > MAX_ADENA) { - Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to set price more than " + MAX_ADENA + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set price more than " + MAX_ADENA + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java index 55c75f0292..ac8373ebdf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java @@ -49,7 +49,7 @@ public class RequestRecipeShopMessageSet implements IClientIncomingPacket if ((_name != null) && (_name.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java index 1a7c1ebc0f..154c1276dd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java @@ -77,7 +77,7 @@ public class RequestRejectPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java index 1cf200da52..9f4036d402 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java @@ -64,7 +64,7 @@ public class RequestSentPost implements IClientIncomingPacket if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to read not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to read not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index c600906d81..5ee37630b2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -134,7 +134,7 @@ public class Say2 implements IClientIncomingPacket if (Config.L2WALKER_PROTECTION && (chatType == ChatType.WHISPER) && checkBot(_text)) { - Util.handleIllegalPlayerAction(player, "Client Emulator Detect: Player " + player.getName() + " using l2walker.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Client Emulator Detect: " + player + " using L2Walker.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index db6358f368..b332fd9707 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -109,7 +109,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java index 76e8ac2a68..89261d5490 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java index d86bfc8f84..88e04641cf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java index 2726f99c08..38de85007e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java @@ -50,7 +50,7 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket if ((_msg != null) && (_msg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index 1747f88e01..2a4ffeef0c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -67,7 +67,7 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); player.sendPacket(ExChangeAttributeFail.STATIC); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java index 7eb252c475..7842f646cd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java @@ -61,35 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning(player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning(player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (15-day) Extension not found in inventory."); return; } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (30-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (30-day) Extension not found in inventory."); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 25dbcf76cd..42951de1fa 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -157,12 +157,12 @@ public class RequestBRBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index b05865c1ad..57f80a3a2d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -156,12 +156,12 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 13ef62f55f..db6c5307ee 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -61,7 +61,7 @@ public class SellListProcure implements IClientOutgoingPacket packet.writeQ(entry.getValue()); // count packet.writeH(item.getItem().getType2()); packet.writeH(0); // unknown - packet.writeQ(0); // price, u shouldnt get any adena for crops, only raw materials + packet.writeQ(0); // price, you shouldnt get any adena for crops, only raw materials } return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/Evolve.java index 51de657d97..753072b609 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/Evolve.java @@ -62,7 +62,7 @@ public class Evolve final Pet currentPet = (Pet) pet; if (currentPet.isAlikeDead()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); return false; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index 1b1d654a3e..5d4876ea78 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -1247,7 +1247,7 @@ public class CastleChamberlain extends AbstractNpcAI } default: { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java index be9f7384bc..6b017fa8e1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java @@ -751,12 +751,12 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader if (newClass == null) { - LOGGER.warning(getClass().getSimpleName() + ": No new classId found for player " + player); + LOGGER.warning(getClass().getSimpleName() + ": No new classId found for " + player); return false; } else if (newClass == player.getClassId()) { - LOGGER.warning(getClass().getSimpleName() + ": New classId found for player " + player + " is exactly the same as the one he currently is!"); + LOGGER.warning(getClass().getSimpleName() + ": New classId found for " + player + " is exactly the same as the one he currently is!"); return false; } else if (checkIfClassChangeHasOptions(player)) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Link.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Link.java index 0615917ca4..380a9f1ae3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Link.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Link.java @@ -69,13 +69,13 @@ public class Link implements IBypassHandler final String htmlPath = command.substring(4).trim(); if (htmlPath.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty link html!"); + LOGGER.warning(player + " sent empty link html!"); return false; } if (htmlPath.contains("..")) { - LOGGER.warning("Player " + player.getName() + " sent invalid link html: " + htmlPath); + LOGGER.warning(player + " sent invalid link html: " + htmlPath); return false; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/communityboard/ClanBoard.java index 3bfdf86486..a205475a6c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/communityboard/ClanBoard.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/communityboard/ClanBoard.java @@ -77,7 +77,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanList(player, 1); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan list bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan list bypass " + command + "!"); } } } @@ -97,7 +97,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanHome(player); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan home bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan home bypass " + command + "!"); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java index dc54e01a0b..df4f03d172 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java @@ -83,7 +83,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for " + player); } } else if (command.startsWith("bbs_add_fav")) @@ -110,7 +110,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for " + player); } } } @@ -134,7 +134,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for " + player); } } return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/communityboard/HomeBoard.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/communityboard/HomeBoard.java index 8c035841d0..8f6320ffef 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/communityboard/HomeBoard.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/communityboard/HomeBoard.java @@ -337,7 +337,7 @@ public class HomeBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for " + player); } return count; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/communityboard/RegionBoard.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/communityboard/RegionBoard.java index 0c5abf5c5a..c6a4392f6a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/communityboard/RegionBoard.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/communityboard/RegionBoard.java @@ -80,7 +80,7 @@ public class RegionBoard implements IWriteBoardHandler final String id = command.replace("_bbsloc;", ""); if (!Util.isDigit(id)) { - LOG.warning(RegionBoard.class.getSimpleName() + ": Player " + player + " sent and invalid region bypass " + command + "!"); + LOG.warning(RegionBoard.class.getSimpleName() + ": " + player + " sent and invalid region bypass " + command + "!"); return false; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/instances/AbstractInstance.java index 06415e9d40..94c337f0df 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/instances/AbstractInstance.java @@ -124,7 +124,7 @@ public abstract class AbstractInstance extends AbstractNpcAI final InstanceTemplate template = manager.getInstanceTemplate(templateId); if (template == null) { - LOGGER.warning("Player " + player.getName() + " (" + player.getObjectId() + ") wants to create instance with unknown template id " + templateId + "!"); + LOGGER.warning(player + " wants to create instance with unknown template id " + templateId + "!"); return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 73914d140e..e288979088 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -278,7 +278,7 @@ public class MultisellData implements IXmlReader } else { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); return; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index 34c26f1ed0..c9bd4ec11e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -99,7 +99,7 @@ public class AdminCommandHandler implements IHandler 0) { @@ -6618,7 +6618,7 @@ public class Player extends Playable // a possible restart-while-modifysubclass cheat has been attempted. // Switching to use base class player.setClassId(player.getBaseClass()); - LOGGER.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); + LOGGER.warning(player + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); } else { @@ -12680,12 +12680,12 @@ public class Player extends Playable if (nextLevel == -1) { - LOGGER.info("Removing skill " + skill + " from player " + toString()); + LOGGER.info("Removing skill " + skill + " from " + this); removeSkill(skill, true); // there is no lower skill } else { - LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString()); + LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for " + this); addSkill(SkillData.getInstance().getSkill(skill.getId(), nextLevel), true); // replace with lower one } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java index 19d0788708..64dd2adb7b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java @@ -81,7 +81,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -93,7 +93,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -104,7 +104,7 @@ public class Teleporter extends Npc // Check for required count of params. if (st.countTokens() != 2) { - LOGGER.warning("Player " + player.getObjectId() + " send unhandled teleport command: " + command); + LOGGER.warning(player + " send unhandled teleport command: " + command); return; } @@ -112,7 +112,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); + LOGGER.warning(player + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); return; } holder.doTeleport(player, this, parseNextInt(st, -1)); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index 5f8e3d9558..a49d1e71ff 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -532,7 +532,7 @@ public class VillageMaster extends Folk */ if (!player.getClient().getFloodProtectors().canChangeSubclass()) { - LOGGER.warning(VillageMaster.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(VillageMaster.class.getName() + ": " + player + " has performed a subclass change too fast"); return; } @@ -592,7 +592,7 @@ public class VillageMaster extends Folk */ if (!player.getClient().getFloodProtectors().canChangeSubclass()) { - LOGGER.warning(VillageMaster.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(VillageMaster.class.getName() + ": " + player + " has performed a subclass change too fast"); return; } @@ -672,7 +672,7 @@ public class VillageMaster extends Folk */ if (!player.getClient().getFloodProtectors().canChangeSubclass()) { - LOGGER.warning(VillageMaster.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(VillageMaster.class.getName() + ": " + player + " has performed a subclass change too fast"); return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/quest/Quest.java index 8c0fb71a38..1d464ba58a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -1561,7 +1561,7 @@ public class Quest extends AbstractScript implements IIdentifiable final Quest q = QuestManager.getInstance().getQuest(questId); if (q == null) { - LOGGER.finer("Unknown quest " + questId + " for player " + player.getName()); + LOGGER.finer("Unknown quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestData.setInt(1, player.getObjectId()); @@ -1592,7 +1592,7 @@ public class Quest extends AbstractScript implements IIdentifiable final QuestState qs = player.getQuestState(questId); if (qs == null) { - LOGGER.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); + LOGGER.finer("Lost variable " + var + " in quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestDataVar.setInt(1, player.getObjectId()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index 1c31ff4a11..eb1434ff89 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -135,7 +135,7 @@ public class TeleportHolder { if (isNoblesse() && !player.isNoble()) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } @@ -194,14 +194,14 @@ public class TeleportHolder { if (isNoblesse() && !player.isNoble()) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } final TeleportLocation loc = getLocation(locId); if (loc == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport location " + locId + " within list " + _name + "!"); + LOGGER.warning(player + " requested unknown teleport location " + locId + " within list " + _name + "!"); return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index a1f5312090..978967ee23 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -120,7 +120,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": " + player + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -137,7 +137,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { // The previous level skill has not been learned. player.sendPacket(SystemMessageId.THE_PREVIOUS_LEVEL_SKILL_HAS_NOT_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } } @@ -164,7 +164,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!canTransform(player)) { player.sendPacket(SystemMessageId.YOU_HAVE_NOT_COMPLETED_THE_NECESSARY_QUEST_FOR_SKILL_ACQUISITION); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); return; } @@ -248,7 +248,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!clan.isLearnableSubPledgeSkill(skill, _subType)) { player.sendPacket(SystemMessageId.THIS_SQUAD_SKILL_HAS_ALREADY_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } @@ -310,7 +310,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -340,7 +340,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -563,7 +563,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (skillLearn.getGetLevel() > player.getLevel()) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_SKILL_LEVEL_REQUIREMENTS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); return false; } @@ -632,7 +632,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { if (!player.destroyItemByItemId("SkillLearn", itemIdCount.getId(), itemIdCount.getCount(), trainer, true)) { - Util.handleIllegalPlayerAction(player, "Somehow player " + player.getName() + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, "Somehow " + player + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index 6ac4cc7ca0..0b8b67f9a0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -91,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { player.sendPacket(ActionFailed.STATIC_PACKET); - PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index dd5c90fce2..eb3d8fc0b1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -88,7 +88,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning(player + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -290,7 +290,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (Exception e) { - PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _command + " " + e.getMessage()); + PacketLogger.warning("Exception processing bypass from " + player + ": " + _command + " " + e.getMessage()); if (player.isGM()) { final StringBuilder sb = new StringBuilder(200); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 5d4b260a76..90500671bf 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -69,7 +69,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to cancel not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to cancel not own post!", Config.DEFAULT_PUNISH); return; } @@ -121,19 +121,19 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items not from mail !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items not from mail !", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 1491cb1bfb..6b1a8b5d37 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -89,7 +89,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info(player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java index 6d59e89936..8685cb4867 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java @@ -77,7 +77,7 @@ public class RequestDeleteReceivedPost implements IClientIncomingPacket } if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java index 88fd8b949d..c4d3846ad7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java @@ -77,7 +77,7 @@ public class RequestDeleteSentPost implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index fbff78ff4c..818ee153d5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -129,7 +129,7 @@ public class RequestEnchantItem implements IClientIncomingPacket // fast auto-enchant cheat check if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " use autoenchant program ", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -139,7 +139,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", scroll.getObjectId(), 1, player, item) == null) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -149,7 +149,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if ((support != null) && (player.getInventory().destroyItem("Enchant", support.getObjectId(), 1, player, item) == null)) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -354,7 +354,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", item, player, null) == null) { // unable to destroy item, cheater ? - Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from player " + player.getName() + ", possible cheater !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from " + player + ", possible cheater !", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); if (Config.LOG_ITEM_ENCHANTS) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index f6b8d47c50..6630088f2a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -126,7 +126,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket default: { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } } @@ -159,7 +159,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket if (attribute.getType() == opositeElement) { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); return; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java index dc903790d0..27ced7e5f8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java @@ -45,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - PacketLogger.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning(player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 29deb5bdc8..bb111e8c17 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -68,7 +68,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 7253226656..0fb3a57829 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -53,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from " + player); } player.sendPacket(ActionFailed.STATIC_PACKET); return; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 79db1768e6..044ebba720 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -51,7 +51,7 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index f51eec948c..b31caa1777 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -76,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " requested Henna Draw remove without any henna."); player.sendPacket(ActionFailed.STATIC_PACKET); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java index 2cdc066ead..f5713d967d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java @@ -50,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty html link!"); + PacketLogger.warning(player + " sent empty html link!"); return; } if (_link.contains("..")) { - PacketLogger.warning("Player " + player.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning(player + " sent invalid html link: link " + _link); return; } final int htmlObjectId = player.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - PacketLogger.warning("Player " + player.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning(player + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 14eb0ff29b..7570e3e5e2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -93,7 +93,7 @@ public class RequestPackageSend implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index e1e1402fb5..c3a945d274 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -108,7 +108,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own attachment!", Config.DEFAULT_PUNISH); return; } @@ -135,19 +135,19 @@ public class RequestPostAttachment implements IClientIncomingPacket // Calculate needed slots if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } @@ -194,7 +194,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java index 2ded12e55d..f70e24e74c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java @@ -135,7 +135,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket if ((storePlayer.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL) && (storeList.getItemCount() > _items.size())) { - final String msgErr = "[RequestPrivateStoreBuy] player " + player.getName() + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; + final String msgErr = "[RequestPrivateStoreBuy] " + player + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java index 6ffcc69313..cbf78835a6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java @@ -65,7 +65,7 @@ public class RequestReceivedPost implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to receive not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to receive not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java index fd6b816fde..04ca270c1d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java @@ -103,13 +103,13 @@ public class RequestRecipeShopListSet implements IClientIncomingPacket final RecipeList list = RecipeData.getInstance().getRecipeList(i.getRecipeId()); 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); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set recipe which he dont have.", Config.DEFAULT_PUNISH); return; } if (i.getCost() > MAX_ADENA) { - Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to set price more than " + MAX_ADENA + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set price more than " + MAX_ADENA + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java index 55c75f0292..ac8373ebdf 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java @@ -49,7 +49,7 @@ public class RequestRecipeShopMessageSet implements IClientIncomingPacket if ((_name != null) && (_name.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java index 1a7c1ebc0f..154c1276dd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java @@ -77,7 +77,7 @@ public class RequestRejectPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java index 1cf200da52..9f4036d402 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java @@ -64,7 +64,7 @@ public class RequestSentPost implements IClientIncomingPacket if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to read not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to read not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index c600906d81..5ee37630b2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -134,7 +134,7 @@ public class Say2 implements IClientIncomingPacket if (Config.L2WALKER_PROTECTION && (chatType == ChatType.WHISPER) && checkBot(_text)) { - Util.handleIllegalPlayerAction(player, "Client Emulator Detect: Player " + player.getName() + " using l2walker.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Client Emulator Detect: " + player + " using L2Walker.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index db6358f368..b332fd9707 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -109,7 +109,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java index 76e8ac2a68..89261d5490 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java index d86bfc8f84..88e04641cf 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java index 2726f99c08..38de85007e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java @@ -50,7 +50,7 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket if ((_msg != null) && (_msg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index bf64e21529..7def665ec6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -67,7 +67,7 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); player.sendPacket(ExChangeAttributeFail.STATIC); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java index 7eb252c475..7842f646cd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java @@ -61,35 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning(player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning(player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (15-day) Extension not found in inventory."); return; } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (30-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (30-day) Extension not found in inventory."); return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 25dbcf76cd..42951de1fa 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -157,12 +157,12 @@ public class RequestBRBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index b05865c1ad..57f80a3a2d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -156,12 +156,12 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 13ef62f55f..db6c5307ee 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -61,7 +61,7 @@ public class SellListProcure implements IClientOutgoingPacket packet.writeQ(entry.getValue()); // count packet.writeH(item.getItem().getType2()); packet.writeH(0); // unknown - packet.writeQ(0); // price, u shouldnt get any adena for crops, only raw materials + packet.writeQ(0); // price, you shouldnt get any adena for crops, only raw materials } return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/Evolve.java index 51de657d97..753072b609 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/Evolve.java @@ -62,7 +62,7 @@ public class Evolve final Pet currentPet = (Pet) pet; if (currentPet.isAlikeDead()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); return false; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index 1b1d654a3e..5d4876ea78 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -1247,7 +1247,7 @@ public class CastleChamberlain extends AbstractNpcAI } default: { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java index be9f7384bc..6b017fa8e1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java @@ -751,12 +751,12 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader if (newClass == null) { - LOGGER.warning(getClass().getSimpleName() + ": No new classId found for player " + player); + LOGGER.warning(getClass().getSimpleName() + ": No new classId found for " + player); return false; } else if (newClass == player.getClassId()) { - LOGGER.warning(getClass().getSimpleName() + ": New classId found for player " + player + " is exactly the same as the one he currently is!"); + LOGGER.warning(getClass().getSimpleName() + ": New classId found for " + player + " is exactly the same as the one he currently is!"); return false; } else if (checkIfClassChangeHasOptions(player)) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/Link.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/Link.java index 0615917ca4..380a9f1ae3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/Link.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/Link.java @@ -69,13 +69,13 @@ public class Link implements IBypassHandler final String htmlPath = command.substring(4).trim(); if (htmlPath.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty link html!"); + LOGGER.warning(player + " sent empty link html!"); return false; } if (htmlPath.contains("..")) { - LOGGER.warning("Player " + player.getName() + " sent invalid link html: " + htmlPath); + LOGGER.warning(player + " sent invalid link html: " + htmlPath); return false; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/communityboard/ClanBoard.java index 3bfdf86486..a205475a6c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/communityboard/ClanBoard.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/communityboard/ClanBoard.java @@ -77,7 +77,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanList(player, 1); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan list bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan list bypass " + command + "!"); } } } @@ -97,7 +97,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanHome(player); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan home bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan home bypass " + command + "!"); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java index dc54e01a0b..df4f03d172 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java @@ -83,7 +83,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for " + player); } } else if (command.startsWith("bbs_add_fav")) @@ -110,7 +110,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for " + player); } } } @@ -134,7 +134,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for " + player); } } return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/communityboard/HomeBoard.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/communityboard/HomeBoard.java index 8c035841d0..8f6320ffef 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/communityboard/HomeBoard.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/communityboard/HomeBoard.java @@ -337,7 +337,7 @@ public class HomeBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for " + player); } return count; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/communityboard/RegionBoard.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/communityboard/RegionBoard.java index 0c5abf5c5a..c6a4392f6a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/communityboard/RegionBoard.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/communityboard/RegionBoard.java @@ -80,7 +80,7 @@ public class RegionBoard implements IWriteBoardHandler final String id = command.replace("_bbsloc;", ""); if (!Util.isDigit(id)) { - LOG.warning(RegionBoard.class.getSimpleName() + ": Player " + player + " sent and invalid region bypass " + command + "!"); + LOG.warning(RegionBoard.class.getSimpleName() + ": " + player + " sent and invalid region bypass " + command + "!"); return false; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/instances/AbstractInstance.java index 06415e9d40..94c337f0df 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/instances/AbstractInstance.java @@ -124,7 +124,7 @@ public abstract class AbstractInstance extends AbstractNpcAI final InstanceTemplate template = manager.getInstanceTemplate(templateId); if (template == null) { - LOGGER.warning("Player " + player.getName() + " (" + player.getObjectId() + ") wants to create instance with unknown template id " + templateId + "!"); + LOGGER.warning(player + " wants to create instance with unknown template id " + templateId + "!"); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 73914d140e..e288979088 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -278,7 +278,7 @@ public class MultisellData implements IXmlReader } else { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); return; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index 34c26f1ed0..c9bd4ec11e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -99,7 +99,7 @@ public class AdminCommandHandler implements IHandler 0) { @@ -6604,7 +6604,7 @@ public class Player extends Playable // a possible restart-while-modifysubclass cheat has been attempted. // Switching to use base class player.setClassId(player.getBaseClass()); - LOGGER.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); + LOGGER.warning(player + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); } else { @@ -12666,12 +12666,12 @@ public class Player extends Playable if (nextLevel == -1) { - LOGGER.info("Removing skill " + skill + " from player " + toString()); + LOGGER.info("Removing skill " + skill + " from " + this); removeSkill(skill, true); // there is no lower skill } else { - LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString()); + LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for " + this); addSkill(SkillData.getInstance().getSkill(skill.getId(), nextLevel), true); // replace with lower one } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java index 19d0788708..64dd2adb7b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java @@ -81,7 +81,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -93,7 +93,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -104,7 +104,7 @@ public class Teleporter extends Npc // Check for required count of params. if (st.countTokens() != 2) { - LOGGER.warning("Player " + player.getObjectId() + " send unhandled teleport command: " + command); + LOGGER.warning(player + " send unhandled teleport command: " + command); return; } @@ -112,7 +112,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); + LOGGER.warning(player + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); return; } holder.doTeleport(player, this, parseNextInt(st, -1)); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index 5f8e3d9558..a49d1e71ff 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -532,7 +532,7 @@ public class VillageMaster extends Folk */ if (!player.getClient().getFloodProtectors().canChangeSubclass()) { - LOGGER.warning(VillageMaster.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(VillageMaster.class.getName() + ": " + player + " has performed a subclass change too fast"); return; } @@ -592,7 +592,7 @@ public class VillageMaster extends Folk */ if (!player.getClient().getFloodProtectors().canChangeSubclass()) { - LOGGER.warning(VillageMaster.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(VillageMaster.class.getName() + ": " + player + " has performed a subclass change too fast"); return; } @@ -672,7 +672,7 @@ public class VillageMaster extends Folk */ if (!player.getClient().getFloodProtectors().canChangeSubclass()) { - LOGGER.warning(VillageMaster.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(VillageMaster.class.getName() + ": " + player + " has performed a subclass change too fast"); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/quest/Quest.java index 8c0fb71a38..1d464ba58a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -1561,7 +1561,7 @@ public class Quest extends AbstractScript implements IIdentifiable final Quest q = QuestManager.getInstance().getQuest(questId); if (q == null) { - LOGGER.finer("Unknown quest " + questId + " for player " + player.getName()); + LOGGER.finer("Unknown quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestData.setInt(1, player.getObjectId()); @@ -1592,7 +1592,7 @@ public class Quest extends AbstractScript implements IIdentifiable final QuestState qs = player.getQuestState(questId); if (qs == null) { - LOGGER.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); + LOGGER.finer("Lost variable " + var + " in quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestDataVar.setInt(1, player.getObjectId()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index 1c31ff4a11..eb1434ff89 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -135,7 +135,7 @@ public class TeleportHolder { if (isNoblesse() && !player.isNoble()) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } @@ -194,14 +194,14 @@ public class TeleportHolder { if (isNoblesse() && !player.isNoble()) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } final TeleportLocation loc = getLocation(locId); if (loc == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport location " + locId + " within list " + _name + "!"); + LOGGER.warning(player + " requested unknown teleport location " + locId + " within list " + _name + "!"); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index 0caa251309..db62efa5d8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -120,7 +120,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": " + player + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -137,7 +137,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { // The previous level skill has not been learned. player.sendPacket(SystemMessageId.THE_PREVIOUS_LEVEL_SKILL_HAS_NOT_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } } @@ -164,7 +164,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!canTransform(player)) { player.sendPacket(SystemMessageId.YOU_HAVE_NOT_COMPLETED_THE_NECESSARY_QUEST_FOR_SKILL_ACQUISITION); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); return; } @@ -248,7 +248,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!clan.isLearnableSubPledgeSkill(skill, _subType)) { player.sendPacket(SystemMessageId.THIS_SQUAD_SKILL_HAS_ALREADY_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } @@ -310,7 +310,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -340,7 +340,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -563,7 +563,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (skillLearn.getGetLevel() > player.getLevel()) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_SKILL_LEVEL_REQUIREMENTS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); return false; } @@ -632,7 +632,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { if (!player.destroyItemByItemId("SkillLearn", itemIdCount.getId(), itemIdCount.getCount(), trainer, true)) { - Util.handleIllegalPlayerAction(player, "Somehow player " + player.getName() + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, "Somehow " + player + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index 6ac4cc7ca0..0b8b67f9a0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -91,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { player.sendPacket(ActionFailed.STATIC_PACKET); - PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index dd5c90fce2..eb3d8fc0b1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -88,7 +88,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning(player + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -290,7 +290,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (Exception e) { - PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _command + " " + e.getMessage()); + PacketLogger.warning("Exception processing bypass from " + player + ": " + _command + " " + e.getMessage()); if (player.isGM()) { final StringBuilder sb = new StringBuilder(200); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index e8d7efa6b0..afec030dc7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -69,7 +69,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to cancel not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to cancel not own post!", Config.DEFAULT_PUNISH); return; } @@ -121,19 +121,19 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items not from mail !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items not from mail !", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 1491cb1bfb..6b1a8b5d37 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -89,7 +89,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info(player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java index 6d59e89936..8685cb4867 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java @@ -77,7 +77,7 @@ public class RequestDeleteReceivedPost implements IClientIncomingPacket } if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java index 88fd8b949d..c4d3846ad7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java @@ -77,7 +77,7 @@ public class RequestDeleteSentPost implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 9b3522967a..8920318a61 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -129,7 +129,7 @@ public class RequestEnchantItem implements IClientIncomingPacket // fast auto-enchant cheat check if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " use autoenchant program ", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -139,7 +139,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", scroll.getObjectId(), 1, player, item) == null) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -149,7 +149,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if ((support != null) && (player.getInventory().destroyItem("Enchant", support.getObjectId(), 1, player, item) == null)) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -354,7 +354,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", item, player, null) == null) { // unable to destroy item, cheater ? - Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from player " + player.getName() + ", possible cheater !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from " + player + ", possible cheater !", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); if (Config.LOG_ITEM_ENCHANTS) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index f6b8d47c50..6630088f2a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -126,7 +126,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket default: { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } } @@ -159,7 +159,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket if (attribute.getType() == opositeElement) { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); return; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java index dc903790d0..27ced7e5f8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java @@ -45,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - PacketLogger.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning(player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 29deb5bdc8..bb111e8c17 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -68,7 +68,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 7253226656..0fb3a57829 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -53,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from " + player); } player.sendPacket(ActionFailed.STATIC_PACKET); return; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 79db1768e6..044ebba720 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -51,7 +51,7 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index f51eec948c..b31caa1777 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -76,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " requested Henna Draw remove without any henna."); player.sendPacket(ActionFailed.STATIC_PACKET); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java index 2cdc066ead..f5713d967d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java @@ -50,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty html link!"); + PacketLogger.warning(player + " sent empty html link!"); return; } if (_link.contains("..")) { - PacketLogger.warning("Player " + player.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning(player + " sent invalid html link: link " + _link); return; } final int htmlObjectId = player.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - PacketLogger.warning("Player " + player.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning(player + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 2cd9c6a8d1..62b2ef4c5a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -93,7 +93,7 @@ public class RequestPackageSend implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 0d49ebb0f5..57db48ddb4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -108,7 +108,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own attachment!", Config.DEFAULT_PUNISH); return; } @@ -135,19 +135,19 @@ public class RequestPostAttachment implements IClientIncomingPacket // Calculate needed slots if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } @@ -194,7 +194,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java index 2ded12e55d..f70e24e74c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java @@ -135,7 +135,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket if ((storePlayer.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL) && (storeList.getItemCount() > _items.size())) { - final String msgErr = "[RequestPrivateStoreBuy] player " + player.getName() + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; + final String msgErr = "[RequestPrivateStoreBuy] " + player + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java index 6ffcc69313..cbf78835a6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java @@ -65,7 +65,7 @@ public class RequestReceivedPost implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to receive not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to receive not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java index fd6b816fde..04ca270c1d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java @@ -103,13 +103,13 @@ public class RequestRecipeShopListSet implements IClientIncomingPacket final RecipeList list = RecipeData.getInstance().getRecipeList(i.getRecipeId()); 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); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set recipe which he dont have.", Config.DEFAULT_PUNISH); return; } if (i.getCost() > MAX_ADENA) { - Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to set price more than " + MAX_ADENA + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set price more than " + MAX_ADENA + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java index 55c75f0292..ac8373ebdf 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java @@ -49,7 +49,7 @@ public class RequestRecipeShopMessageSet implements IClientIncomingPacket if ((_name != null) && (_name.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java index 1a7c1ebc0f..154c1276dd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java @@ -77,7 +77,7 @@ public class RequestRejectPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java index 1cf200da52..9f4036d402 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java @@ -64,7 +64,7 @@ public class RequestSentPost implements IClientIncomingPacket if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to read not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to read not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index c600906d81..5ee37630b2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -134,7 +134,7 @@ public class Say2 implements IClientIncomingPacket if (Config.L2WALKER_PROTECTION && (chatType == ChatType.WHISPER) && checkBot(_text)) { - Util.handleIllegalPlayerAction(player, "Client Emulator Detect: Player " + player.getName() + " using l2walker.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Client Emulator Detect: " + player + " using L2Walker.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 13ecd08a96..1c02a4a421 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -109,7 +109,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java index 76e8ac2a68..89261d5490 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java index d86bfc8f84..88e04641cf 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java index 2726f99c08..38de85007e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java @@ -50,7 +50,7 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket if ((_msg != null) && (_msg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index bf64e21529..7def665ec6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -67,7 +67,7 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); player.sendPacket(ExChangeAttributeFail.STATIC); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java index 7eb252c475..7842f646cd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java @@ -61,35 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning(player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning(player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (15-day) Extension not found in inventory."); return; } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (30-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (30-day) Extension not found in inventory."); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 25dbcf76cd..42951de1fa 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -157,12 +157,12 @@ public class RequestBRBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index b05865c1ad..57f80a3a2d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -156,12 +156,12 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 13ef62f55f..db6c5307ee 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -61,7 +61,7 @@ public class SellListProcure implements IClientOutgoingPacket packet.writeQ(entry.getValue()); // count packet.writeH(item.getItem().getType2()); packet.writeH(0); // unknown - packet.writeQ(0); // price, u shouldnt get any adena for crops, only raw materials + packet.writeQ(0); // price, you shouldnt get any adena for crops, only raw materials } return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/Evolve.java index 51de657d97..753072b609 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/Evolve.java @@ -62,7 +62,7 @@ public class Evolve final Pet currentPet = (Pet) pet; if (currentPet.isAlikeDead()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); return false; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index 1b1d654a3e..5d4876ea78 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -1247,7 +1247,7 @@ public class CastleChamberlain extends AbstractNpcAI } default: { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java index be9f7384bc..6b017fa8e1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java @@ -751,12 +751,12 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader if (newClass == null) { - LOGGER.warning(getClass().getSimpleName() + ": No new classId found for player " + player); + LOGGER.warning(getClass().getSimpleName() + ": No new classId found for " + player); return false; } else if (newClass == player.getClassId()) { - LOGGER.warning(getClass().getSimpleName() + ": New classId found for player " + player + " is exactly the same as the one he currently is!"); + LOGGER.warning(getClass().getSimpleName() + ": New classId found for " + player + " is exactly the same as the one he currently is!"); return false; } else if (checkIfClassChangeHasOptions(player)) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/Link.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/Link.java index 0615917ca4..380a9f1ae3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/Link.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/Link.java @@ -69,13 +69,13 @@ public class Link implements IBypassHandler final String htmlPath = command.substring(4).trim(); if (htmlPath.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty link html!"); + LOGGER.warning(player + " sent empty link html!"); return false; } if (htmlPath.contains("..")) { - LOGGER.warning("Player " + player.getName() + " sent invalid link html: " + htmlPath); + LOGGER.warning(player + " sent invalid link html: " + htmlPath); return false; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/communityboard/ClanBoard.java index 3bfdf86486..a205475a6c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/communityboard/ClanBoard.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/communityboard/ClanBoard.java @@ -77,7 +77,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanList(player, 1); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan list bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan list bypass " + command + "!"); } } } @@ -97,7 +97,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanHome(player); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan home bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan home bypass " + command + "!"); } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java index dc54e01a0b..df4f03d172 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java @@ -83,7 +83,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for " + player); } } else if (command.startsWith("bbs_add_fav")) @@ -110,7 +110,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for " + player); } } } @@ -134,7 +134,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for " + player); } } return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/communityboard/HomeBoard.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/communityboard/HomeBoard.java index 8c035841d0..8f6320ffef 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/communityboard/HomeBoard.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/communityboard/HomeBoard.java @@ -337,7 +337,7 @@ public class HomeBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for " + player); } return count; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/communityboard/RegionBoard.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/communityboard/RegionBoard.java index 0c5abf5c5a..c6a4392f6a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/communityboard/RegionBoard.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/communityboard/RegionBoard.java @@ -80,7 +80,7 @@ public class RegionBoard implements IWriteBoardHandler final String id = command.replace("_bbsloc;", ""); if (!Util.isDigit(id)) { - LOG.warning(RegionBoard.class.getSimpleName() + ": Player " + player + " sent and invalid region bypass " + command + "!"); + LOG.warning(RegionBoard.class.getSimpleName() + ": " + player + " sent and invalid region bypass " + command + "!"); return false; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/instances/AbstractInstance.java index 400724e3e0..6ba657bc23 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/instances/AbstractInstance.java @@ -124,7 +124,7 @@ public abstract class AbstractInstance extends AbstractNpcAI final InstanceTemplate template = manager.getInstanceTemplate(templateId); if (template == null) { - LOGGER.warning("Player " + player.getName() + " (" + player.getObjectId() + ") wants to create instance with unknown template id " + templateId + "!"); + LOGGER.warning(player + " wants to create instance with unknown template id " + templateId + "!"); return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 73914d140e..e288979088 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -278,7 +278,7 @@ public class MultisellData implements IXmlReader } else { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); return; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index 34c26f1ed0..c9bd4ec11e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -99,7 +99,7 @@ public class AdminCommandHandler implements IHandler 0) { @@ -6618,7 +6618,7 @@ public class Player extends Playable // a possible restart-while-modifysubclass cheat has been attempted. // Switching to use base class player.setClassId(player.getBaseClass()); - LOGGER.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); + LOGGER.warning(player + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); } else { @@ -12714,12 +12714,12 @@ public class Player extends Playable if (nextLevel == -1) { - LOGGER.info("Removing skill " + skill + " from player " + toString()); + LOGGER.info("Removing skill " + skill + " from " + this); removeSkill(skill, true); // there is no lower skill } else { - LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString()); + LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for " + this); addSkill(SkillData.getInstance().getSkill(skill.getId(), nextLevel), true); // replace with lower one } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java index 19d0788708..64dd2adb7b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java @@ -81,7 +81,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -93,7 +93,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -104,7 +104,7 @@ public class Teleporter extends Npc // Check for required count of params. if (st.countTokens() != 2) { - LOGGER.warning("Player " + player.getObjectId() + " send unhandled teleport command: " + command); + LOGGER.warning(player + " send unhandled teleport command: " + command); return; } @@ -112,7 +112,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); + LOGGER.warning(player + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); return; } holder.doTeleport(player, this, parseNextInt(st, -1)); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index 5f8e3d9558..a49d1e71ff 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -532,7 +532,7 @@ public class VillageMaster extends Folk */ if (!player.getClient().getFloodProtectors().canChangeSubclass()) { - LOGGER.warning(VillageMaster.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(VillageMaster.class.getName() + ": " + player + " has performed a subclass change too fast"); return; } @@ -592,7 +592,7 @@ public class VillageMaster extends Folk */ if (!player.getClient().getFloodProtectors().canChangeSubclass()) { - LOGGER.warning(VillageMaster.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(VillageMaster.class.getName() + ": " + player + " has performed a subclass change too fast"); return; } @@ -672,7 +672,7 @@ public class VillageMaster extends Folk */ if (!player.getClient().getFloodProtectors().canChangeSubclass()) { - LOGGER.warning(VillageMaster.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(VillageMaster.class.getName() + ": " + player + " has performed a subclass change too fast"); return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/quest/Quest.java index 8c0fb71a38..1d464ba58a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -1561,7 +1561,7 @@ public class Quest extends AbstractScript implements IIdentifiable final Quest q = QuestManager.getInstance().getQuest(questId); if (q == null) { - LOGGER.finer("Unknown quest " + questId + " for player " + player.getName()); + LOGGER.finer("Unknown quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestData.setInt(1, player.getObjectId()); @@ -1592,7 +1592,7 @@ public class Quest extends AbstractScript implements IIdentifiable final QuestState qs = player.getQuestState(questId); if (qs == null) { - LOGGER.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); + LOGGER.finer("Lost variable " + var + " in quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestDataVar.setInt(1, player.getObjectId()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index 1c31ff4a11..eb1434ff89 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -135,7 +135,7 @@ public class TeleportHolder { if (isNoblesse() && !player.isNoble()) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } @@ -194,14 +194,14 @@ public class TeleportHolder { if (isNoblesse() && !player.isNoble()) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } final TeleportLocation loc = getLocation(locId); if (loc == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport location " + locId + " within list " + _name + "!"); + LOGGER.warning(player + " requested unknown teleport location " + locId + " within list " + _name + "!"); return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index 542c49de02..4a1ca5917a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -120,7 +120,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": " + player + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -137,7 +137,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { // The previous level skill has not been learned. player.sendPacket(SystemMessageId.THE_PREVIOUS_LEVEL_SKILL_HAS_NOT_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } } @@ -164,7 +164,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!canTransform(player)) { player.sendPacket(SystemMessageId.YOU_HAVE_NOT_COMPLETED_THE_NECESSARY_QUEST_FOR_SKILL_ACQUISITION); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); return; } @@ -248,7 +248,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!clan.isLearnableSubPledgeSkill(skill, _subType)) { player.sendPacket(SystemMessageId.THIS_SQUAD_SKILL_HAS_ALREADY_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } @@ -310,7 +310,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -340,7 +340,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -563,7 +563,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (skillLearn.getGetLevel() > player.getLevel()) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_SKILL_LEVEL_REQUIREMENTS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); return false; } @@ -632,7 +632,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { if (!player.destroyItemByItemId("SkillLearn", itemIdCount.getId(), itemIdCount.getCount(), trainer, true)) { - Util.handleIllegalPlayerAction(player, "Somehow player " + player.getName() + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, "Somehow " + player + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index 6ac4cc7ca0..0b8b67f9a0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -91,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { player.sendPacket(ActionFailed.STATIC_PACKET); - PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index dd5c90fce2..eb3d8fc0b1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -88,7 +88,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning(player + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -290,7 +290,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (Exception e) { - PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _command + " " + e.getMessage()); + PacketLogger.warning("Exception processing bypass from " + player + ": " + _command + " " + e.getMessage()); if (player.isGM()) { final StringBuilder sb = new StringBuilder(200); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index e8d7efa6b0..afec030dc7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -69,7 +69,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to cancel not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to cancel not own post!", Config.DEFAULT_PUNISH); return; } @@ -121,19 +121,19 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items not from mail !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items not from mail !", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 1491cb1bfb..6b1a8b5d37 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -89,7 +89,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info(player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java index 6d59e89936..8685cb4867 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java @@ -77,7 +77,7 @@ public class RequestDeleteReceivedPost implements IClientIncomingPacket } if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java index 88fd8b949d..c4d3846ad7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java @@ -77,7 +77,7 @@ public class RequestDeleteSentPost implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 9b3522967a..8920318a61 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -129,7 +129,7 @@ public class RequestEnchantItem implements IClientIncomingPacket // fast auto-enchant cheat check if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " use autoenchant program ", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -139,7 +139,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", scroll.getObjectId(), 1, player, item) == null) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -149,7 +149,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if ((support != null) && (player.getInventory().destroyItem("Enchant", support.getObjectId(), 1, player, item) == null)) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -354,7 +354,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", item, player, null) == null) { // unable to destroy item, cheater ? - Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from player " + player.getName() + ", possible cheater !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from " + player + ", possible cheater !", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); if (Config.LOG_ITEM_ENCHANTS) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index f6b8d47c50..6630088f2a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -126,7 +126,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket default: { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } } @@ -159,7 +159,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket if (attribute.getType() == opositeElement) { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); return; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java index dc903790d0..27ced7e5f8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java @@ -45,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - PacketLogger.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning(player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 29deb5bdc8..bb111e8c17 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -68,7 +68,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 7253226656..0fb3a57829 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -53,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from " + player); } player.sendPacket(ActionFailed.STATIC_PACKET); return; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 79db1768e6..044ebba720 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -51,7 +51,7 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index f51eec948c..b31caa1777 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -76,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " requested Henna Draw remove without any henna."); player.sendPacket(ActionFailed.STATIC_PACKET); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java index 2cdc066ead..f5713d967d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java @@ -50,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty html link!"); + PacketLogger.warning(player + " sent empty html link!"); return; } if (_link.contains("..")) { - PacketLogger.warning("Player " + player.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning(player + " sent invalid html link: link " + _link); return; } final int htmlObjectId = player.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - PacketLogger.warning("Player " + player.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning(player + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 2cd9c6a8d1..62b2ef4c5a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -93,7 +93,7 @@ public class RequestPackageSend implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 0d49ebb0f5..57db48ddb4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -108,7 +108,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own attachment!", Config.DEFAULT_PUNISH); return; } @@ -135,19 +135,19 @@ public class RequestPostAttachment implements IClientIncomingPacket // Calculate needed slots if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } @@ -194,7 +194,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java index 2ded12e55d..f70e24e74c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java @@ -135,7 +135,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket if ((storePlayer.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL) && (storeList.getItemCount() > _items.size())) { - final String msgErr = "[RequestPrivateStoreBuy] player " + player.getName() + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; + final String msgErr = "[RequestPrivateStoreBuy] " + player + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java index 6ffcc69313..cbf78835a6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java @@ -65,7 +65,7 @@ public class RequestReceivedPost implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to receive not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to receive not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java index fd6b816fde..04ca270c1d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java @@ -103,13 +103,13 @@ public class RequestRecipeShopListSet implements IClientIncomingPacket final RecipeList list = RecipeData.getInstance().getRecipeList(i.getRecipeId()); 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); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set recipe which he dont have.", Config.DEFAULT_PUNISH); return; } if (i.getCost() > MAX_ADENA) { - Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to set price more than " + MAX_ADENA + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set price more than " + MAX_ADENA + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java index 55c75f0292..ac8373ebdf 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java @@ -49,7 +49,7 @@ public class RequestRecipeShopMessageSet implements IClientIncomingPacket if ((_name != null) && (_name.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java index 1a7c1ebc0f..154c1276dd 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java @@ -77,7 +77,7 @@ public class RequestRejectPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java index 1cf200da52..9f4036d402 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java @@ -64,7 +64,7 @@ public class RequestSentPost implements IClientIncomingPacket if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to read not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to read not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index c600906d81..5ee37630b2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -134,7 +134,7 @@ public class Say2 implements IClientIncomingPacket if (Config.L2WALKER_PROTECTION && (chatType == ChatType.WHISPER) && checkBot(_text)) { - Util.handleIllegalPlayerAction(player, "Client Emulator Detect: Player " + player.getName() + " using l2walker.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Client Emulator Detect: " + player + " using L2Walker.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 13ecd08a96..1c02a4a421 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -109,7 +109,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java index 76e8ac2a68..89261d5490 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java index d86bfc8f84..88e04641cf 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java index 2726f99c08..38de85007e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java @@ -50,7 +50,7 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket if ((_msg != null) && (_msg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index bf64e21529..7def665ec6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -67,7 +67,7 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); player.sendPacket(ExChangeAttributeFail.STATIC); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java index 7eb252c475..7842f646cd 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java @@ -61,35 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning(player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning(player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (15-day) Extension not found in inventory."); return; } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (30-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (30-day) Extension not found in inventory."); return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 25dbcf76cd..42951de1fa 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -157,12 +157,12 @@ public class RequestBRBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index b05865c1ad..57f80a3a2d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -156,12 +156,12 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 13ef62f55f..db6c5307ee 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -61,7 +61,7 @@ public class SellListProcure implements IClientOutgoingPacket packet.writeQ(entry.getValue()); // count packet.writeH(item.getItem().getType2()); packet.writeH(0); // unknown - packet.writeQ(0); // price, u shouldnt get any adena for crops, only raw materials + packet.writeQ(0); // price, you shouldnt get any adena for crops, only raw materials } return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/Evolve.java index 51de657d97..753072b609 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/Evolve.java @@ -62,7 +62,7 @@ public class Evolve final Pet currentPet = (Pet) pet; if (currentPet.isAlikeDead()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); return false; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index 1b1d654a3e..5d4876ea78 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -1247,7 +1247,7 @@ public class CastleChamberlain extends AbstractNpcAI } default: { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java index be9f7384bc..6b017fa8e1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java @@ -751,12 +751,12 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader if (newClass == null) { - LOGGER.warning(getClass().getSimpleName() + ": No new classId found for player " + player); + LOGGER.warning(getClass().getSimpleName() + ": No new classId found for " + player); return false; } else if (newClass == player.getClassId()) { - LOGGER.warning(getClass().getSimpleName() + ": New classId found for player " + player + " is exactly the same as the one he currently is!"); + LOGGER.warning(getClass().getSimpleName() + ": New classId found for " + player + " is exactly the same as the one he currently is!"); return false; } else if (checkIfClassChangeHasOptions(player)) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/Link.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/Link.java index 0615917ca4..380a9f1ae3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/Link.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/Link.java @@ -69,13 +69,13 @@ public class Link implements IBypassHandler final String htmlPath = command.substring(4).trim(); if (htmlPath.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty link html!"); + LOGGER.warning(player + " sent empty link html!"); return false; } if (htmlPath.contains("..")) { - LOGGER.warning("Player " + player.getName() + " sent invalid link html: " + htmlPath); + LOGGER.warning(player + " sent invalid link html: " + htmlPath); return false; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/communityboard/ClanBoard.java index 3bfdf86486..a205475a6c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/communityboard/ClanBoard.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/communityboard/ClanBoard.java @@ -77,7 +77,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanList(player, 1); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan list bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan list bypass " + command + "!"); } } } @@ -97,7 +97,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanHome(player); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan home bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan home bypass " + command + "!"); } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java index dc54e01a0b..df4f03d172 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java @@ -83,7 +83,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for " + player); } } else if (command.startsWith("bbs_add_fav")) @@ -110,7 +110,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for " + player); } } } @@ -134,7 +134,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for " + player); } } return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/communityboard/HomeBoard.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/communityboard/HomeBoard.java index 8c035841d0..8f6320ffef 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/communityboard/HomeBoard.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/communityboard/HomeBoard.java @@ -337,7 +337,7 @@ public class HomeBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for " + player); } return count; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/communityboard/RegionBoard.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/communityboard/RegionBoard.java index 0c5abf5c5a..c6a4392f6a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/communityboard/RegionBoard.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/communityboard/RegionBoard.java @@ -80,7 +80,7 @@ public class RegionBoard implements IWriteBoardHandler final String id = command.replace("_bbsloc;", ""); if (!Util.isDigit(id)) { - LOG.warning(RegionBoard.class.getSimpleName() + ": Player " + player + " sent and invalid region bypass " + command + "!"); + LOG.warning(RegionBoard.class.getSimpleName() + ": " + player + " sent and invalid region bypass " + command + "!"); return false; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/instances/AbstractInstance.java index aad33470bf..d485c2c36d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/instances/AbstractInstance.java @@ -124,7 +124,7 @@ public abstract class AbstractInstance extends AbstractNpcAI final InstanceTemplate template = manager.getInstanceTemplate(templateId); if (template == null) { - LOGGER.warning("Player " + player.getName() + " (" + player.getObjectId() + ") wants to create instance with unknown template id " + templateId + "!"); + LOGGER.warning(player + " wants to create instance with unknown template id " + templateId + "!"); return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 73914d140e..e288979088 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -278,7 +278,7 @@ public class MultisellData implements IXmlReader } else { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); return; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index 34c26f1ed0..c9bd4ec11e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -99,7 +99,7 @@ public class AdminCommandHandler implements IHandler 0) { @@ -6618,7 +6618,7 @@ public class Player extends Playable // a possible restart-while-modifysubclass cheat has been attempted. // Switching to use base class player.setClassId(player.getBaseClass()); - LOGGER.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); + LOGGER.warning(player + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); } else { @@ -12714,12 +12714,12 @@ public class Player extends Playable if (nextLevel == -1) { - LOGGER.info("Removing skill " + skill + " from player " + toString()); + LOGGER.info("Removing skill " + skill + " from " + this); removeSkill(skill, true); // there is no lower skill } else { - LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString()); + LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for " + this); addSkill(SkillData.getInstance().getSkill(skill.getId(), nextLevel), true); // replace with lower one } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java index 19d0788708..64dd2adb7b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java @@ -81,7 +81,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -93,7 +93,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -104,7 +104,7 @@ public class Teleporter extends Npc // Check for required count of params. if (st.countTokens() != 2) { - LOGGER.warning("Player " + player.getObjectId() + " send unhandled teleport command: " + command); + LOGGER.warning(player + " send unhandled teleport command: " + command); return; } @@ -112,7 +112,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); + LOGGER.warning(player + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); return; } holder.doTeleport(player, this, parseNextInt(st, -1)); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index 5f8e3d9558..a49d1e71ff 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -532,7 +532,7 @@ public class VillageMaster extends Folk */ if (!player.getClient().getFloodProtectors().canChangeSubclass()) { - LOGGER.warning(VillageMaster.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(VillageMaster.class.getName() + ": " + player + " has performed a subclass change too fast"); return; } @@ -592,7 +592,7 @@ public class VillageMaster extends Folk */ if (!player.getClient().getFloodProtectors().canChangeSubclass()) { - LOGGER.warning(VillageMaster.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(VillageMaster.class.getName() + ": " + player + " has performed a subclass change too fast"); return; } @@ -672,7 +672,7 @@ public class VillageMaster extends Folk */ if (!player.getClient().getFloodProtectors().canChangeSubclass()) { - LOGGER.warning(VillageMaster.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(VillageMaster.class.getName() + ": " + player + " has performed a subclass change too fast"); return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/Quest.java index 8c0fb71a38..1d464ba58a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -1561,7 +1561,7 @@ public class Quest extends AbstractScript implements IIdentifiable final Quest q = QuestManager.getInstance().getQuest(questId); if (q == null) { - LOGGER.finer("Unknown quest " + questId + " for player " + player.getName()); + LOGGER.finer("Unknown quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestData.setInt(1, player.getObjectId()); @@ -1592,7 +1592,7 @@ public class Quest extends AbstractScript implements IIdentifiable final QuestState qs = player.getQuestState(questId); if (qs == null) { - LOGGER.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); + LOGGER.finer("Lost variable " + var + " in quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestDataVar.setInt(1, player.getObjectId()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index 1c31ff4a11..eb1434ff89 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -135,7 +135,7 @@ public class TeleportHolder { if (isNoblesse() && !player.isNoble()) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } @@ -194,14 +194,14 @@ public class TeleportHolder { if (isNoblesse() && !player.isNoble()) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } final TeleportLocation loc = getLocation(locId); if (loc == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport location " + locId + " within list " + _name + "!"); + LOGGER.warning(player + " requested unknown teleport location " + locId + " within list " + _name + "!"); return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index 542c49de02..4a1ca5917a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -120,7 +120,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": " + player + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -137,7 +137,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { // The previous level skill has not been learned. player.sendPacket(SystemMessageId.THE_PREVIOUS_LEVEL_SKILL_HAS_NOT_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } } @@ -164,7 +164,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!canTransform(player)) { player.sendPacket(SystemMessageId.YOU_HAVE_NOT_COMPLETED_THE_NECESSARY_QUEST_FOR_SKILL_ACQUISITION); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); return; } @@ -248,7 +248,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!clan.isLearnableSubPledgeSkill(skill, _subType)) { player.sendPacket(SystemMessageId.THIS_SQUAD_SKILL_HAS_ALREADY_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } @@ -310,7 +310,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -340,7 +340,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -563,7 +563,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (skillLearn.getGetLevel() > player.getLevel()) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_SKILL_LEVEL_REQUIREMENTS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); return false; } @@ -632,7 +632,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { if (!player.destroyItemByItemId("SkillLearn", itemIdCount.getId(), itemIdCount.getCount(), trainer, true)) { - Util.handleIllegalPlayerAction(player, "Somehow player " + player.getName() + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, "Somehow " + player + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index 6ac4cc7ca0..0b8b67f9a0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -91,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { player.sendPacket(ActionFailed.STATIC_PACKET); - PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index dd5c90fce2..eb3d8fc0b1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -88,7 +88,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning(player + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -290,7 +290,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (Exception e) { - PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _command + " " + e.getMessage()); + PacketLogger.warning("Exception processing bypass from " + player + ": " + _command + " " + e.getMessage()); if (player.isGM()) { final StringBuilder sb = new StringBuilder(200); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index e8d7efa6b0..afec030dc7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -69,7 +69,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to cancel not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to cancel not own post!", Config.DEFAULT_PUNISH); return; } @@ -121,19 +121,19 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items not from mail !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items not from mail !", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index d76760750a..465807cb96 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -89,7 +89,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info(player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java index 6d59e89936..8685cb4867 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java @@ -77,7 +77,7 @@ public class RequestDeleteReceivedPost implements IClientIncomingPacket } if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java index 88fd8b949d..c4d3846ad7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java @@ -77,7 +77,7 @@ public class RequestDeleteSentPost implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index bccd4d9235..a5687ee0d7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -131,7 +131,7 @@ public class RequestEnchantItem implements IClientIncomingPacket // fast auto-enchant cheat check if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " use autoenchant program ", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -141,7 +141,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", scroll.getObjectId(), 1, player, item) == null) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -151,7 +151,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if ((support != null) && (player.getInventory().destroyItem("Enchant", support.getObjectId(), 1, player, item) == null)) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -356,7 +356,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", item, player, null) == null) { // unable to destroy item, cheater ? - Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from player " + player.getName() + ", possible cheater !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from " + player + ", possible cheater !", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); if (Config.LOG_ITEM_ENCHANTS) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index f6b8d47c50..6630088f2a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -126,7 +126,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket default: { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } } @@ -159,7 +159,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket if (attribute.getType() == opositeElement) { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); return; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java index dc903790d0..27ced7e5f8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java @@ -45,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - PacketLogger.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning(player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 29deb5bdc8..bb111e8c17 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -68,7 +68,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 7253226656..0fb3a57829 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -53,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from " + player); } player.sendPacket(ActionFailed.STATIC_PACKET); return; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 79db1768e6..044ebba720 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -51,7 +51,7 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index f51eec948c..b31caa1777 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -76,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " requested Henna Draw remove without any henna."); player.sendPacket(ActionFailed.STATIC_PACKET); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java index 2cdc066ead..f5713d967d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java @@ -50,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty html link!"); + PacketLogger.warning(player + " sent empty html link!"); return; } if (_link.contains("..")) { - PacketLogger.warning("Player " + player.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning(player + " sent invalid html link: link " + _link); return; } final int htmlObjectId = player.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - PacketLogger.warning("Player " + player.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning(player + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 2cd9c6a8d1..62b2ef4c5a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -93,7 +93,7 @@ public class RequestPackageSend implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 0d49ebb0f5..57db48ddb4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -108,7 +108,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own attachment!", Config.DEFAULT_PUNISH); return; } @@ -135,19 +135,19 @@ public class RequestPostAttachment implements IClientIncomingPacket // Calculate needed slots if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } @@ -194,7 +194,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java index 2ded12e55d..f70e24e74c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java @@ -135,7 +135,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket if ((storePlayer.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL) && (storeList.getItemCount() > _items.size())) { - final String msgErr = "[RequestPrivateStoreBuy] player " + player.getName() + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; + final String msgErr = "[RequestPrivateStoreBuy] " + player + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java index 6ffcc69313..cbf78835a6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java @@ -65,7 +65,7 @@ public class RequestReceivedPost implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to receive not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to receive not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java index fd6b816fde..04ca270c1d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java @@ -103,13 +103,13 @@ public class RequestRecipeShopListSet implements IClientIncomingPacket final RecipeList list = RecipeData.getInstance().getRecipeList(i.getRecipeId()); 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); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set recipe which he dont have.", Config.DEFAULT_PUNISH); return; } if (i.getCost() > MAX_ADENA) { - Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to set price more than " + MAX_ADENA + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set price more than " + MAX_ADENA + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java index 55c75f0292..ac8373ebdf 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java @@ -49,7 +49,7 @@ public class RequestRecipeShopMessageSet implements IClientIncomingPacket if ((_name != null) && (_name.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java index 1a7c1ebc0f..154c1276dd 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java @@ -77,7 +77,7 @@ public class RequestRejectPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java index 1cf200da52..9f4036d402 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java @@ -64,7 +64,7 @@ public class RequestSentPost implements IClientIncomingPacket if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to read not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to read not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index c600906d81..5ee37630b2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -134,7 +134,7 @@ public class Say2 implements IClientIncomingPacket if (Config.L2WALKER_PROTECTION && (chatType == ChatType.WHISPER) && checkBot(_text)) { - Util.handleIllegalPlayerAction(player, "Client Emulator Detect: Player " + player.getName() + " using l2walker.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Client Emulator Detect: " + player + " using L2Walker.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 13ecd08a96..1c02a4a421 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -109,7 +109,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java index 76e8ac2a68..89261d5490 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java index d86bfc8f84..88e04641cf 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java index 2726f99c08..38de85007e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java @@ -50,7 +50,7 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket if ((_msg != null) && (_msg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index bf64e21529..7def665ec6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -67,7 +67,7 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); player.sendPacket(ExChangeAttributeFail.STATIC); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java index 7eb252c475..7842f646cd 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java @@ -61,35 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning(player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning(player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (15-day) Extension not found in inventory."); return; } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (30-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (30-day) Extension not found in inventory."); return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 25dbcf76cd..42951de1fa 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -157,12 +157,12 @@ public class RequestBRBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index b05865c1ad..57f80a3a2d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -156,12 +156,12 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 13ef62f55f..db6c5307ee 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -61,7 +61,7 @@ public class SellListProcure implements IClientOutgoingPacket packet.writeQ(entry.getValue()); // count packet.writeH(item.getItem().getType2()); packet.writeH(0); // unknown - packet.writeQ(0); // price, u shouldnt get any adena for crops, only raw materials + packet.writeQ(0); // price, you shouldnt get any adena for crops, only raw materials } return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/Evolve.java index 51de657d97..753072b609 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/Evolve.java @@ -62,7 +62,7 @@ public class Evolve final Pet currentPet = (Pet) pet; if (currentPet.isAlikeDead()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); return false; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index 1b1d654a3e..5d4876ea78 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -1247,7 +1247,7 @@ public class CastleChamberlain extends AbstractNpcAI } default: { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java index 374a2fd51f..8a996b4927 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java @@ -686,12 +686,12 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader final ClassId newClass = Arrays.stream(ClassId.values()).filter(cid -> player.getClassId() == cid.getParent()).findAny().orElse(null); if (newClass == null) { - LOGGER.warning(getClass().getSimpleName() + ": No new classId found for player " + player); + LOGGER.warning(getClass().getSimpleName() + ": No new classId found for " + player); return false; } else if (newClass == player.getClassId()) { - LOGGER.warning(getClass().getSimpleName() + ": New classId found for player " + player + " is exactly the same as the one he currently is!"); + LOGGER.warning(getClass().getSimpleName() + ": New classId found for " + player + " is exactly the same as the one he currently is!"); return false; } else if (checkIfClassChangeHasOptions(player)) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/bypasshandlers/Link.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/bypasshandlers/Link.java index 0615917ca4..380a9f1ae3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/bypasshandlers/Link.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/bypasshandlers/Link.java @@ -69,13 +69,13 @@ public class Link implements IBypassHandler final String htmlPath = command.substring(4).trim(); if (htmlPath.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty link html!"); + LOGGER.warning(player + " sent empty link html!"); return false; } if (htmlPath.contains("..")) { - LOGGER.warning("Player " + player.getName() + " sent invalid link html: " + htmlPath); + LOGGER.warning(player + " sent invalid link html: " + htmlPath); return false; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/communityboard/ClanBoard.java index 3bfdf86486..a205475a6c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/communityboard/ClanBoard.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/communityboard/ClanBoard.java @@ -77,7 +77,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanList(player, 1); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan list bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan list bypass " + command + "!"); } } } @@ -97,7 +97,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanHome(player); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan home bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan home bypass " + command + "!"); } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java index dc54e01a0b..df4f03d172 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java @@ -83,7 +83,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for " + player); } } else if (command.startsWith("bbs_add_fav")) @@ -110,7 +110,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for " + player); } } } @@ -134,7 +134,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for " + player); } } return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/communityboard/HomeBoard.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/communityboard/HomeBoard.java index 8c035841d0..8f6320ffef 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/communityboard/HomeBoard.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/communityboard/HomeBoard.java @@ -337,7 +337,7 @@ public class HomeBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for " + player); } return count; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/communityboard/RegionBoard.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/communityboard/RegionBoard.java index 0c5abf5c5a..c6a4392f6a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/communityboard/RegionBoard.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/communityboard/RegionBoard.java @@ -80,7 +80,7 @@ public class RegionBoard implements IWriteBoardHandler final String id = command.replace("_bbsloc;", ""); if (!Util.isDigit(id)) { - LOG.warning(RegionBoard.class.getSimpleName() + ": Player " + player + " sent and invalid region bypass " + command + "!"); + LOG.warning(RegionBoard.class.getSimpleName() + ": " + player + " sent and invalid region bypass " + command + "!"); return false; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/AbstractInstance.java index aad33470bf..d485c2c36d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/AbstractInstance.java @@ -124,7 +124,7 @@ public abstract class AbstractInstance extends AbstractNpcAI final InstanceTemplate template = manager.getInstanceTemplate(templateId); if (template == null) { - LOGGER.warning("Player " + player.getName() + " (" + player.getObjectId() + ") wants to create instance with unknown template id " + templateId + "!"); + LOGGER.warning(player + " wants to create instance with unknown template id " + templateId + "!"); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 73914d140e..e288979088 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -278,7 +278,7 @@ public class MultisellData implements IXmlReader } else { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); return; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index 34c26f1ed0..c9bd4ec11e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -99,7 +99,7 @@ public class AdminCommandHandler implements IHandler 0) { @@ -6572,7 +6572,7 @@ public class Player extends Playable // a possible restart-while-modifysubclass cheat has been attempted. // Switching to use base class player.setClassId(player.getBaseClass()); - LOGGER.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); + LOGGER.warning(player + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); } else { @@ -12724,12 +12724,12 @@ public class Player extends Playable if (nextLevel == -1) { - LOGGER.info("Removing skill " + skill + " from player " + toString()); + LOGGER.info("Removing skill " + skill + " from " + this); removeSkill(skill, true); // there is no lower skill } else { - LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString()); + LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for " + this); addSkill(SkillData.getInstance().getSkill(skill.getId(), nextLevel), true); // replace with lower one } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java index a81331a92e..f2f0d67ab5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java @@ -82,7 +82,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -99,7 +99,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -110,7 +110,7 @@ public class Teleporter extends Npc // Check for required count of params. if (st.countTokens() != 2) { - LOGGER.warning("Player " + player.getObjectId() + " send unhandled teleport command: " + command); + LOGGER.warning(player + " send unhandled teleport command: " + command); return; } @@ -118,7 +118,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); + LOGGER.warning(player + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); return; } holder.doTeleport(player, this, parseNextInt(st, -1)); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index f5ed628952..a120178b02 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -532,7 +532,7 @@ public class VillageMaster extends Folk */ if (!player.getClient().getFloodProtectors().canChangeSubclass()) { - LOGGER.warning(VillageMaster.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(VillageMaster.class.getName() + ": " + player + " has performed a subclass change too fast"); return; } @@ -592,7 +592,7 @@ public class VillageMaster extends Folk */ if (!player.getClient().getFloodProtectors().canChangeSubclass()) { - LOGGER.warning(VillageMaster.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(VillageMaster.class.getName() + ": " + player + " has performed a subclass change too fast"); return; } @@ -672,7 +672,7 @@ public class VillageMaster extends Folk */ if (!player.getClient().getFloodProtectors().canChangeSubclass()) { - LOGGER.warning(VillageMaster.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(VillageMaster.class.getName() + ": " + player + " has performed a subclass change too fast"); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/Quest.java index 8c0fb71a38..1d464ba58a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -1561,7 +1561,7 @@ public class Quest extends AbstractScript implements IIdentifiable final Quest q = QuestManager.getInstance().getQuest(questId); if (q == null) { - LOGGER.finer("Unknown quest " + questId + " for player " + player.getName()); + LOGGER.finer("Unknown quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestData.setInt(1, player.getObjectId()); @@ -1592,7 +1592,7 @@ public class Quest extends AbstractScript implements IIdentifiable final QuestState qs = player.getQuestState(questId); if (qs == null) { - LOGGER.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); + LOGGER.finer("Lost variable " + var + " in quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestDataVar.setInt(1, player.getObjectId()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index 1c31ff4a11..eb1434ff89 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -135,7 +135,7 @@ public class TeleportHolder { if (isNoblesse() && !player.isNoble()) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } @@ -194,14 +194,14 @@ public class TeleportHolder { if (isNoblesse() && !player.isNoble()) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } final TeleportLocation loc = getLocation(locId); if (loc == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport location " + locId + " within list " + _name + "!"); + LOGGER.warning(player + " requested unknown teleport location " + locId + " within list " + _name + "!"); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index 2b7af6518f..37c36d66f2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -111,7 +111,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": " + player + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -128,7 +128,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { // The previous level skill has not been learned. player.sendPacket(SystemMessageId.THE_PREVIOUS_LEVEL_SKILL_HAS_NOT_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } } @@ -155,7 +155,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!canTransform(player)) { player.sendPacket(SystemMessageId.YOU_HAVE_NOT_COMPLETED_THE_NECESSARY_QUEST_FOR_SKILL_ACQUISITION); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); return; } @@ -239,7 +239,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!clan.isLearnableSubPledgeSkill(skill, _subType)) { player.sendPacket(SystemMessageId.THIS_SQUAD_SKILL_HAS_ALREADY_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } @@ -301,7 +301,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -331,7 +331,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -482,7 +482,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (skillLearn.getGetLevel() > player.getLevel()) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_SKILL_LEVEL_REQUIREMENTS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); return false; } @@ -551,7 +551,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { if (!player.destroyItemByItemId("SkillLearn", itemIdCount.getId(), itemIdCount.getCount(), trainer, true)) { - Util.handleIllegalPlayerAction(player, "Somehow player " + player.getName() + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, "Somehow " + player + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index 6ac4cc7ca0..0b8b67f9a0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -91,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { player.sendPacket(ActionFailed.STATIC_PACKET); - PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index dd5c90fce2..eb3d8fc0b1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -88,7 +88,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning(player + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -290,7 +290,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (Exception e) { - PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _command + " " + e.getMessage()); + PacketLogger.warning("Exception processing bypass from " + player + ": " + _command + " " + e.getMessage()); if (player.isGM()) { final StringBuilder sb = new StringBuilder(200); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index e8d7efa6b0..afec030dc7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -69,7 +69,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to cancel not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to cancel not own post!", Config.DEFAULT_PUNISH); return; } @@ -121,19 +121,19 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items not from mail !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items not from mail !", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index d76760750a..465807cb96 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -89,7 +89,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info(player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java index 6d59e89936..8685cb4867 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java @@ -77,7 +77,7 @@ public class RequestDeleteReceivedPost implements IClientIncomingPacket } if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java index 88fd8b949d..c4d3846ad7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java @@ -77,7 +77,7 @@ public class RequestDeleteSentPost implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index bccd4d9235..a5687ee0d7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -131,7 +131,7 @@ public class RequestEnchantItem implements IClientIncomingPacket // fast auto-enchant cheat check if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " use autoenchant program ", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -141,7 +141,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", scroll.getObjectId(), 1, player, item) == null) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -151,7 +151,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if ((support != null) && (player.getInventory().destroyItem("Enchant", support.getObjectId(), 1, player, item) == null)) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -356,7 +356,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", item, player, null) == null) { // unable to destroy item, cheater ? - Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from player " + player.getName() + ", possible cheater !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from " + player + ", possible cheater !", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); if (Config.LOG_ITEM_ENCHANTS) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index f6b8d47c50..6630088f2a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -126,7 +126,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket default: { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } } @@ -159,7 +159,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket if (attribute.getType() == opositeElement) { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); return; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java index dc903790d0..27ced7e5f8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java @@ -45,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - PacketLogger.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning(player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 29deb5bdc8..bb111e8c17 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -68,7 +68,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 7253226656..0fb3a57829 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -53,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from " + player); } player.sendPacket(ActionFailed.STATIC_PACKET); return; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 79db1768e6..044ebba720 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -51,7 +51,7 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index f51eec948c..b31caa1777 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -76,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " requested Henna Draw remove without any henna."); player.sendPacket(ActionFailed.STATIC_PACKET); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java index 2cdc066ead..f5713d967d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java @@ -50,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty html link!"); + PacketLogger.warning(player + " sent empty html link!"); return; } if (_link.contains("..")) { - PacketLogger.warning("Player " + player.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning(player + " sent invalid html link: link " + _link); return; } final int htmlObjectId = player.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - PacketLogger.warning("Player " + player.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning(player + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 2cd9c6a8d1..62b2ef4c5a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -93,7 +93,7 @@ public class RequestPackageSend implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 0d49ebb0f5..57db48ddb4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -108,7 +108,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own attachment!", Config.DEFAULT_PUNISH); return; } @@ -135,19 +135,19 @@ public class RequestPostAttachment implements IClientIncomingPacket // Calculate needed slots if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } @@ -194,7 +194,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java index 2ded12e55d..f70e24e74c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java @@ -135,7 +135,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket if ((storePlayer.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL) && (storeList.getItemCount() > _items.size())) { - final String msgErr = "[RequestPrivateStoreBuy] player " + player.getName() + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; + final String msgErr = "[RequestPrivateStoreBuy] " + player + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java index 6ffcc69313..cbf78835a6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java @@ -65,7 +65,7 @@ public class RequestReceivedPost implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to receive not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to receive not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java index fd6b816fde..04ca270c1d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java @@ -103,13 +103,13 @@ public class RequestRecipeShopListSet implements IClientIncomingPacket final RecipeList list = RecipeData.getInstance().getRecipeList(i.getRecipeId()); 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); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set recipe which he dont have.", Config.DEFAULT_PUNISH); return; } if (i.getCost() > MAX_ADENA) { - Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to set price more than " + MAX_ADENA + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set price more than " + MAX_ADENA + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java index 55c75f0292..ac8373ebdf 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java @@ -49,7 +49,7 @@ public class RequestRecipeShopMessageSet implements IClientIncomingPacket if ((_name != null) && (_name.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java index 1a7c1ebc0f..154c1276dd 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java @@ -77,7 +77,7 @@ public class RequestRejectPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java index 1cf200da52..9f4036d402 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java @@ -64,7 +64,7 @@ public class RequestSentPost implements IClientIncomingPacket if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to read not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to read not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index c600906d81..5ee37630b2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -134,7 +134,7 @@ public class Say2 implements IClientIncomingPacket if (Config.L2WALKER_PROTECTION && (chatType == ChatType.WHISPER) && checkBot(_text)) { - Util.handleIllegalPlayerAction(player, "Client Emulator Detect: Player " + player.getName() + " using l2walker.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Client Emulator Detect: " + player + " using L2Walker.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 13ecd08a96..1c02a4a421 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -109,7 +109,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java index 76e8ac2a68..89261d5490 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java index d86bfc8f84..88e04641cf 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java index 2726f99c08..38de85007e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java @@ -50,7 +50,7 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket if ((_msg != null) && (_msg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index bf64e21529..7def665ec6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -67,7 +67,7 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); player.sendPacket(ExChangeAttributeFail.STATIC); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java index 7eb252c475..7842f646cd 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java @@ -61,35 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning(player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning(player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (15-day) Extension not found in inventory."); return; } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (30-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (30-day) Extension not found in inventory."); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 25dbcf76cd..42951de1fa 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -157,12 +157,12 @@ public class RequestBRBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index b05865c1ad..57f80a3a2d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -156,12 +156,12 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 13ef62f55f..db6c5307ee 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -61,7 +61,7 @@ public class SellListProcure implements IClientOutgoingPacket packet.writeQ(entry.getValue()); // count packet.writeH(item.getItem().getType2()); packet.writeH(0); // unknown - packet.writeQ(0); // price, u shouldnt get any adena for crops, only raw materials + packet.writeQ(0); // price, you shouldnt get any adena for crops, only raw materials } return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/Evolve.java index 51de657d97..753072b609 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/Evolve.java @@ -62,7 +62,7 @@ public class Evolve final Pet currentPet = (Pet) pet; if (currentPet.isAlikeDead()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); return false; } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index 8ccd2e35c5..43fd590760 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -1247,7 +1247,7 @@ public class CastleChamberlain extends AbstractNpcAI } default: { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java index be9f7384bc..6b017fa8e1 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java @@ -751,12 +751,12 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader if (newClass == null) { - LOGGER.warning(getClass().getSimpleName() + ": No new classId found for player " + player); + LOGGER.warning(getClass().getSimpleName() + ": No new classId found for " + player); return false; } else if (newClass == player.getClassId()) { - LOGGER.warning(getClass().getSimpleName() + ": New classId found for player " + player + " is exactly the same as the one he currently is!"); + LOGGER.warning(getClass().getSimpleName() + ": New classId found for " + player + " is exactly the same as the one he currently is!"); return false; } else if (checkIfClassChangeHasOptions(player)) diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/Link.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/Link.java index 82d5f562b4..e73fc8216a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/Link.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/Link.java @@ -64,13 +64,13 @@ public class Link implements IBypassHandler final String htmlPath = command.substring(4).trim(); if (htmlPath.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty link html!"); + LOGGER.warning(player + " sent empty link html!"); return false; } if (htmlPath.contains("..")) { - LOGGER.warning("Player " + player.getName() + " sent invalid link html: " + htmlPath); + LOGGER.warning(player + " sent invalid link html: " + htmlPath); return false; } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/communityboard/ClanBoard.java index 3bfdf86486..a205475a6c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/communityboard/ClanBoard.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/communityboard/ClanBoard.java @@ -77,7 +77,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanList(player, 1); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan list bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan list bypass " + command + "!"); } } } @@ -97,7 +97,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanHome(player); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan home bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan home bypass " + command + "!"); } } } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java index dc54e01a0b..df4f03d172 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java @@ -83,7 +83,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for " + player); } } else if (command.startsWith("bbs_add_fav")) @@ -110,7 +110,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for " + player); } } } @@ -134,7 +134,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for " + player); } } return true; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/communityboard/HomeBoard.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/communityboard/HomeBoard.java index 8c035841d0..8f6320ffef 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/communityboard/HomeBoard.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/communityboard/HomeBoard.java @@ -337,7 +337,7 @@ public class HomeBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for " + player); } return count; } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/communityboard/RegionBoard.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/communityboard/RegionBoard.java index 0c5abf5c5a..c6a4392f6a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/communityboard/RegionBoard.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/communityboard/RegionBoard.java @@ -80,7 +80,7 @@ public class RegionBoard implements IWriteBoardHandler final String id = command.replace("_bbsloc;", ""); if (!Util.isDigit(id)) { - LOG.warning(RegionBoard.class.getSimpleName() + ": Player " + player + " sent and invalid region bypass " + command + "!"); + LOG.warning(RegionBoard.class.getSimpleName() + ": " + player + " sent and invalid region bypass " + command + "!"); return false; } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/instances/AbstractInstance.java index 06415e9d40..94c337f0df 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/instances/AbstractInstance.java @@ -124,7 +124,7 @@ public abstract class AbstractInstance extends AbstractNpcAI final InstanceTemplate template = manager.getInstanceTemplate(templateId); if (template == null) { - LOGGER.warning("Player " + player.getName() + " (" + player.getObjectId() + ") wants to create instance with unknown template id " + templateId + "!"); + LOGGER.warning(player + " wants to create instance with unknown template id " + templateId + "!"); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index ed22b22e6b..3678eb76bb 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -286,7 +286,7 @@ public class MultisellData implements IXmlReader } else { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); return; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index 34c26f1ed0..c9bd4ec11e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -99,7 +99,7 @@ public class AdminCommandHandler implements IHandler 0) { @@ -6599,7 +6599,7 @@ public class Player extends Playable // a possible restart-while-modifysubclass cheat has been attempted. // Switching to use base class player.setClassId(player.getBaseClass()); - LOGGER.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); + LOGGER.warning(player + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); } else { @@ -12676,12 +12676,12 @@ public class Player extends Playable if (nextLevel == -1) { - LOGGER.info("Removing skill " + skill + " from player " + toString()); + LOGGER.info("Removing skill " + skill + " from " + this); removeSkill(skill, true); // there is no lower skill } else { - LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString()); + LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for " + this); addSkill(SkillData.getInstance().getSkill(skill.getId(), nextLevel), true); // replace with lower one } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java index 19d0788708..64dd2adb7b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java @@ -81,7 +81,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -93,7 +93,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -104,7 +104,7 @@ public class Teleporter extends Npc // Check for required count of params. if (st.countTokens() != 2) { - LOGGER.warning("Player " + player.getObjectId() + " send unhandled teleport command: " + command); + LOGGER.warning(player + " send unhandled teleport command: " + command); return; } @@ -112,7 +112,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); + LOGGER.warning(player + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); return; } holder.doTeleport(player, this, parseNextInt(st, -1)); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index 5f8e3d9558..a49d1e71ff 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -532,7 +532,7 @@ public class VillageMaster extends Folk */ if (!player.getClient().getFloodProtectors().canChangeSubclass()) { - LOGGER.warning(VillageMaster.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(VillageMaster.class.getName() + ": " + player + " has performed a subclass change too fast"); return; } @@ -592,7 +592,7 @@ public class VillageMaster extends Folk */ if (!player.getClient().getFloodProtectors().canChangeSubclass()) { - LOGGER.warning(VillageMaster.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(VillageMaster.class.getName() + ": " + player + " has performed a subclass change too fast"); return; } @@ -672,7 +672,7 @@ public class VillageMaster extends Folk */ if (!player.getClient().getFloodProtectors().canChangeSubclass()) { - LOGGER.warning(VillageMaster.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(VillageMaster.class.getName() + ": " + player + " has performed a subclass change too fast"); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java index 8c0fb71a38..1d464ba58a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -1561,7 +1561,7 @@ public class Quest extends AbstractScript implements IIdentifiable final Quest q = QuestManager.getInstance().getQuest(questId); if (q == null) { - LOGGER.finer("Unknown quest " + questId + " for player " + player.getName()); + LOGGER.finer("Unknown quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestData.setInt(1, player.getObjectId()); @@ -1592,7 +1592,7 @@ public class Quest extends AbstractScript implements IIdentifiable final QuestState qs = player.getQuestState(questId); if (qs == null) { - LOGGER.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); + LOGGER.finer("Lost variable " + var + " in quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestDataVar.setInt(1, player.getObjectId()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index 1c31ff4a11..eb1434ff89 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -135,7 +135,7 @@ public class TeleportHolder { if (isNoblesse() && !player.isNoble()) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } @@ -194,14 +194,14 @@ public class TeleportHolder { if (isNoblesse() && !player.isNoble()) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } final TeleportLocation loc = getLocation(locId); if (loc == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport location " + locId + " within list " + _name + "!"); + LOGGER.warning(player + " requested unknown teleport location " + locId + " within list " + _name + "!"); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index a1f5312090..978967ee23 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -120,7 +120,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": " + player + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -137,7 +137,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { // The previous level skill has not been learned. player.sendPacket(SystemMessageId.THE_PREVIOUS_LEVEL_SKILL_HAS_NOT_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } } @@ -164,7 +164,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!canTransform(player)) { player.sendPacket(SystemMessageId.YOU_HAVE_NOT_COMPLETED_THE_NECESSARY_QUEST_FOR_SKILL_ACQUISITION); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); return; } @@ -248,7 +248,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!clan.isLearnableSubPledgeSkill(skill, _subType)) { player.sendPacket(SystemMessageId.THIS_SQUAD_SKILL_HAS_ALREADY_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } @@ -310,7 +310,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -340,7 +340,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -563,7 +563,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (skillLearn.getGetLevel() > player.getLevel()) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_SKILL_LEVEL_REQUIREMENTS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); return false; } @@ -632,7 +632,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { if (!player.destroyItemByItemId("SkillLearn", itemIdCount.getId(), itemIdCount.getCount(), trainer, true)) { - Util.handleIllegalPlayerAction(player, "Somehow player " + player.getName() + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, "Somehow " + player + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); } } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index 6ac4cc7ca0..0b8b67f9a0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -91,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { player.sendPacket(ActionFailed.STATIC_PACKET); - PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index dd5c90fce2..eb3d8fc0b1 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -88,7 +88,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning(player + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -290,7 +290,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (Exception e) { - PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _command + " " + e.getMessage()); + PacketLogger.warning("Exception processing bypass from " + player + ": " + _command + " " + e.getMessage()); if (player.isGM()) { final StringBuilder sb = new StringBuilder(200); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 5d4b260a76..90500671bf 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -69,7 +69,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to cancel not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to cancel not own post!", Config.DEFAULT_PUNISH); return; } @@ -121,19 +121,19 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items not from mail !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items not from mail !", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 1491cb1bfb..6b1a8b5d37 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -89,7 +89,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info(player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java index 6d59e89936..8685cb4867 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java @@ -77,7 +77,7 @@ public class RequestDeleteReceivedPost implements IClientIncomingPacket } if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java index 88fd8b949d..c4d3846ad7 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java @@ -77,7 +77,7 @@ public class RequestDeleteSentPost implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 7a6b2b8704..310babb0c2 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -129,7 +129,7 @@ public class RequestEnchantItem implements IClientIncomingPacket // fast auto-enchant cheat check if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " use autoenchant program ", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -139,7 +139,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", scroll.getObjectId(), 1, player, item) == null) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -149,7 +149,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if ((support != null) && (player.getInventory().destroyItem("Enchant", support.getObjectId(), 1, player, item) == null)) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -354,7 +354,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", item, player, null) == null) { // unable to destroy item, cheater ? - Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from player " + player.getName() + ", possible cheater !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from " + player + ", possible cheater !", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); if (Config.LOG_ITEM_ENCHANTS) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index f6b8d47c50..6630088f2a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -126,7 +126,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket default: { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } } @@ -159,7 +159,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket if (attribute.getType() == opositeElement) { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); return; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java index dc903790d0..27ced7e5f8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java @@ -45,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - PacketLogger.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning(player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 29deb5bdc8..bb111e8c17 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -68,7 +68,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 7253226656..0fb3a57829 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -53,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from " + player); } player.sendPacket(ActionFailed.STATIC_PACKET); return; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 79db1768e6..044ebba720 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -51,7 +51,7 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index f51eec948c..b31caa1777 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -76,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " requested Henna Draw remove without any henna."); player.sendPacket(ActionFailed.STATIC_PACKET); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java index 2cdc066ead..f5713d967d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java @@ -50,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty html link!"); + PacketLogger.warning(player + " sent empty html link!"); return; } if (_link.contains("..")) { - PacketLogger.warning("Player " + player.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning(player + " sent invalid html link: link " + _link); return; } final int htmlObjectId = player.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - PacketLogger.warning("Player " + player.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning(player + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 14eb0ff29b..7570e3e5e2 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -93,7 +93,7 @@ public class RequestPackageSend implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index e1e1402fb5..c3a945d274 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -108,7 +108,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own attachment!", Config.DEFAULT_PUNISH); return; } @@ -135,19 +135,19 @@ public class RequestPostAttachment implements IClientIncomingPacket // Calculate needed slots if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } @@ -194,7 +194,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java index 2ded12e55d..f70e24e74c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java @@ -135,7 +135,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket if ((storePlayer.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL) && (storeList.getItemCount() > _items.size())) { - final String msgErr = "[RequestPrivateStoreBuy] player " + player.getName() + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; + final String msgErr = "[RequestPrivateStoreBuy] " + player + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java index 6ffcc69313..cbf78835a6 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java @@ -65,7 +65,7 @@ public class RequestReceivedPost implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to receive not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to receive not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java index fd6b816fde..04ca270c1d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java @@ -103,13 +103,13 @@ public class RequestRecipeShopListSet implements IClientIncomingPacket final RecipeList list = RecipeData.getInstance().getRecipeList(i.getRecipeId()); 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); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set recipe which he dont have.", Config.DEFAULT_PUNISH); return; } if (i.getCost() > MAX_ADENA) { - Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to set price more than " + MAX_ADENA + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set price more than " + MAX_ADENA + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java index 55c75f0292..ac8373ebdf 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java @@ -49,7 +49,7 @@ public class RequestRecipeShopMessageSet implements IClientIncomingPacket if ((_name != null) && (_name.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java index 1a7c1ebc0f..154c1276dd 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java @@ -77,7 +77,7 @@ public class RequestRejectPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java index 1cf200da52..9f4036d402 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java @@ -64,7 +64,7 @@ public class RequestSentPost implements IClientIncomingPacket if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to read not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to read not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index c600906d81..5ee37630b2 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -134,7 +134,7 @@ public class Say2 implements IClientIncomingPacket if (Config.L2WALKER_PROTECTION && (chatType == ChatType.WHISPER) && checkBot(_text)) { - Util.handleIllegalPlayerAction(player, "Client Emulator Detect: Player " + player.getName() + " using l2walker.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Client Emulator Detect: " + player + " using L2Walker.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index db6358f368..b332fd9707 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -109,7 +109,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java index 76e8ac2a68..89261d5490 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java index d86bfc8f84..88e04641cf 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java index 2726f99c08..38de85007e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java @@ -50,7 +50,7 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket if ((_msg != null) && (_msg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index bf64e21529..7def665ec6 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -67,7 +67,7 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); player.sendPacket(ExChangeAttributeFail.STATIC); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java index 924fb288da..fee3809f62 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java @@ -61,37 +61,37 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning(player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning(player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (15-day) Extension not found in inventory."); return; } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (30-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (30-day) Extension not found in inventory."); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 1b6a022140..727ebc986b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -124,12 +124,12 @@ public class RequestBRBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index 44e131c329..6eb754180a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -145,12 +145,12 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 13ef62f55f..db6c5307ee 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -61,7 +61,7 @@ public class SellListProcure implements IClientOutgoingPacket packet.writeQ(entry.getValue()); // count packet.writeH(item.getItem().getType2()); packet.writeH(0); // unknown - packet.writeQ(0); // price, u shouldnt get any adena for crops, only raw materials + packet.writeQ(0); // price, you shouldnt get any adena for crops, only raw materials } return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/Evolve.java index 51de657d97..753072b609 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/Evolve.java @@ -62,7 +62,7 @@ public class Evolve final Pet currentPet = (Pet) pet; if (currentPet.isAlikeDead()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); return false; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index 52b1a4ec7e..f4ab3e4904 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -1247,7 +1247,7 @@ public class CastleChamberlain extends AbstractNpcAI } default: { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java index 45ae4355d5..56144e2a2b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java @@ -716,12 +716,12 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader final ClassId newClass = Arrays.stream(ClassId.values()).filter(cid -> player.getClassId() == cid.getParent()).findAny().orElse(null); if (newClass == null) { - LOGGER.warning(getClass().getSimpleName() + ": No new classId found for player " + player); + LOGGER.warning(getClass().getSimpleName() + ": No new classId found for " + player); return false; } else if (newClass == player.getClassId()) { - LOGGER.warning(getClass().getSimpleName() + ": New classId found for player " + player + " is exactly the same as the one he currently is!"); + LOGGER.warning(getClass().getSimpleName() + ": New classId found for " + player + " is exactly the same as the one he currently is!"); return false; } else if (checkIfClassChangeHasOptions(player)) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/bypasshandlers/Link.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/bypasshandlers/Link.java index bd7e222ea4..5097e77f56 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/bypasshandlers/Link.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/bypasshandlers/Link.java @@ -60,13 +60,13 @@ public class Link implements IBypassHandler final String htmlPath = command.substring(4).trim(); if (htmlPath.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty link html!"); + LOGGER.warning(player + " sent empty link html!"); return false; } if (htmlPath.contains("..")) { - LOGGER.warning("Player " + player.getName() + " sent invalid link html: " + htmlPath); + LOGGER.warning(player + " sent invalid link html: " + htmlPath); return false; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/communityboard/ClanBoard.java index 3bfdf86486..a205475a6c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/communityboard/ClanBoard.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/communityboard/ClanBoard.java @@ -77,7 +77,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanList(player, 1); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan list bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan list bypass " + command + "!"); } } } @@ -97,7 +97,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanHome(player); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan home bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan home bypass " + command + "!"); } } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java index dc54e01a0b..df4f03d172 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java @@ -83,7 +83,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for " + player); } } else if (command.startsWith("bbs_add_fav")) @@ -110,7 +110,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for " + player); } } } @@ -134,7 +134,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for " + player); } } return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/communityboard/HomeBoard.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/communityboard/HomeBoard.java index 99074bfdce..5264227778 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/communityboard/HomeBoard.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/communityboard/HomeBoard.java @@ -337,7 +337,7 @@ public class HomeBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for " + player); } return count; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/communityboard/RegionBoard.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/communityboard/RegionBoard.java index 0c5abf5c5a..c6a4392f6a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/communityboard/RegionBoard.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/communityboard/RegionBoard.java @@ -80,7 +80,7 @@ public class RegionBoard implements IWriteBoardHandler final String id = command.replace("_bbsloc;", ""); if (!Util.isDigit(id)) { - LOG.warning(RegionBoard.class.getSimpleName() + ": Player " + player + " sent and invalid region bypass " + command + "!"); + LOG.warning(RegionBoard.class.getSimpleName() + ": " + player + " sent and invalid region bypass " + command + "!"); return false; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/AbstractInstance.java index aad33470bf..d485c2c36d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/AbstractInstance.java @@ -124,7 +124,7 @@ public abstract class AbstractInstance extends AbstractNpcAI final InstanceTemplate template = manager.getInstanceTemplate(templateId); if (template == null) { - LOGGER.warning("Player " + player.getName() + " (" + player.getObjectId() + ") wants to create instance with unknown template id " + templateId + "!"); + LOGGER.warning(player + " wants to create instance with unknown template id " + templateId + "!"); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 73914d140e..e288979088 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -278,7 +278,7 @@ public class MultisellData implements IXmlReader } else { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); return; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index 34c26f1ed0..c9bd4ec11e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -99,7 +99,7 @@ public class AdminCommandHandler implements IHandler 0) { @@ -6710,7 +6710,7 @@ public class Player extends Playable // a possible restart-while-modifysubclass cheat has been attempted. // Switching to use base class player.setClassId(player.getBaseClass()); - LOGGER.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); + LOGGER.warning(player + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); } else { @@ -12995,12 +12995,12 @@ public class Player extends Playable if (nextLevel == -1) { - LOGGER.info("Removing skill " + skill + " from player " + toString()); + LOGGER.info("Removing skill " + skill + " from " + this); removeSkill(skill, true); // there is no lower skill } else { - LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString()); + LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for " + this); addSkill(SkillData.getInstance().getSkill(skill.getId(), nextLevel), true); // replace with lower one } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java index a62c22d7c8..084963b5e5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java @@ -82,7 +82,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -99,7 +99,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -110,7 +110,7 @@ public class Teleporter extends Npc // Check for required count of params. if (st.countTokens() != 2) { - LOGGER.warning("Player " + player.getObjectId() + " send unhandled teleport command: " + command); + LOGGER.warning(player + " send unhandled teleport command: " + command); return; } @@ -118,7 +118,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); + LOGGER.warning(player + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); return; } holder.doTeleport(player, this, parseNextInt(st, -1)); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index 90815103ac..1c7b874b20 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -532,7 +532,7 @@ public class VillageMaster extends Folk */ if (!player.getClient().getFloodProtectors().canChangeSubclass()) { - LOGGER.warning(VillageMaster.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(VillageMaster.class.getName() + ": " + player + " has performed a subclass change too fast"); return; } @@ -592,7 +592,7 @@ public class VillageMaster extends Folk */ if (!player.getClient().getFloodProtectors().canChangeSubclass()) { - LOGGER.warning(VillageMaster.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(VillageMaster.class.getName() + ": " + player + " has performed a subclass change too fast"); return; } @@ -672,7 +672,7 @@ public class VillageMaster extends Folk */ if (!player.getClient().getFloodProtectors().canChangeSubclass()) { - LOGGER.warning(VillageMaster.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(VillageMaster.class.getName() + ": " + player + " has performed a subclass change too fast"); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/quest/Quest.java index 587ec66236..c8b3ca4706 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -1568,7 +1568,7 @@ public class Quest extends AbstractScript implements IIdentifiable final Quest q = QuestManager.getInstance().getQuest(questId); if (q == null) { - LOGGER.finer("Unknown quest " + questId + " for player " + player.getName()); + LOGGER.finer("Unknown quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestData.setInt(1, player.getObjectId()); @@ -1599,7 +1599,7 @@ public class Quest extends AbstractScript implements IIdentifiable final QuestState qs = player.getQuestState(questId); if (qs == null) { - LOGGER.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); + LOGGER.finer("Lost variable " + var + " in quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestDataVar.setInt(1, player.getObjectId()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index 1c31ff4a11..eb1434ff89 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -135,7 +135,7 @@ public class TeleportHolder { if (isNoblesse() && !player.isNoble()) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } @@ -194,14 +194,14 @@ public class TeleportHolder { if (isNoblesse() && !player.isNoble()) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } final TeleportLocation loc = getLocation(locId); if (loc == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport location " + locId + " within list " + _name + "!"); + LOGGER.warning(player + " requested unknown teleport location " + locId + " within list " + _name + "!"); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index a37e21c83c..ed5d8e88a7 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -111,7 +111,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": " + player + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -128,7 +128,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { // The previous level skill has not been learned. player.sendPacket(SystemMessageId.THE_PREVIOUS_LEVEL_SKILL_HAS_NOT_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } } @@ -155,7 +155,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!canTransform(player)) { player.sendPacket(SystemMessageId.YOU_HAVE_NOT_COMPLETED_THE_NECESSARY_QUEST_FOR_SKILL_ACQUISITION); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); return; } @@ -239,7 +239,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!clan.isLearnableSubPledgeSkill(skill, _subType)) { player.sendPacket(SystemMessageId.THIS_SQUAD_SKILL_HAS_ALREADY_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } @@ -301,7 +301,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -331,7 +331,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -482,7 +482,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (skillLearn.getGetLevel() > player.getLevel()) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_SKILL_LEVEL_REQUIREMENTS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); return false; } @@ -551,7 +551,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { if (!player.destroyItemByItemId("SkillLearn", itemIdCount.getId(), itemIdCount.getCount(), trainer, true)) { - Util.handleIllegalPlayerAction(player, "Somehow player " + player.getName() + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, "Somehow " + player + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); } } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index 6ac4cc7ca0..0b8b67f9a0 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -91,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { player.sendPacket(ActionFailed.STATIC_PACKET); - PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index dd5c90fce2..eb3d8fc0b1 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -88,7 +88,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning(player + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -290,7 +290,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (Exception e) { - PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _command + " " + e.getMessage()); + PacketLogger.warning("Exception processing bypass from " + player + ": " + _command + " " + e.getMessage()); if (player.isGM()) { final StringBuilder sb = new StringBuilder(200); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index e87b17fa93..34acb06ab7 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -69,7 +69,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to cancel not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to cancel not own post!", Config.DEFAULT_PUNISH); return; } @@ -121,19 +121,19 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items not from mail !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items not from mail !", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 1f68699a51..0d2a17a608 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -89,7 +89,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info(player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java index 6d59e89936..8685cb4867 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java @@ -77,7 +77,7 @@ public class RequestDeleteReceivedPost implements IClientIncomingPacket } if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java index 88fd8b949d..c4d3846ad7 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java @@ -77,7 +77,7 @@ public class RequestDeleteSentPost implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 1e6a76dbec..4e6da0591b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -132,7 +132,7 @@ public class RequestEnchantItem implements IClientIncomingPacket // Lowered value to 500 (from 2000) On Essence, some enchantments are much faster than normal ones. if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 500)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " use autoenchant program ", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -142,7 +142,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", scroll.getObjectId(), 1, player, item) == null) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -152,7 +152,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if ((support != null) && (player.getInventory().destroyItem("Enchant", support.getObjectId(), 1, player, item) == null)) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -361,7 +361,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", item, player, null) == null) { // unable to destroy item, cheater ? - Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from player " + player.getName() + ", possible cheater !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from " + player + ", possible cheater !", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); if (Config.LOG_ITEM_ENCHANTS) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index 558dd2f66a..c270b1fe4c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -126,7 +126,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket default: { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } } @@ -159,7 +159,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket if (attribute.getType() == opositeElement) { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); return; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java index dc903790d0..27ced7e5f8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java @@ -45,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - PacketLogger.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning(player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); } } \ No newline at end of file diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 29deb5bdc8..bb111e8c17 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -68,7 +68,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 7253226656..0fb3a57829 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -53,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from " + player); } player.sendPacket(ActionFailed.STATIC_PACKET); return; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 79db1768e6..044ebba720 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -51,7 +51,7 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index f51eec948c..b31caa1777 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -76,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " requested Henna Draw remove without any henna."); player.sendPacket(ActionFailed.STATIC_PACKET); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java index 2cdc066ead..f5713d967d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java @@ -50,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty html link!"); + PacketLogger.warning(player + " sent empty html link!"); return; } if (_link.contains("..")) { - PacketLogger.warning("Player " + player.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning(player + " sent invalid html link: link " + _link); return; } final int htmlObjectId = player.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - PacketLogger.warning("Player " + player.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning(player + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index e8de8fee2a..8dae89d3bf 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -86,7 +86,7 @@ public class RequestPackageSend implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 6a1acfe748..40f8227090 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -108,7 +108,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own attachment!", Config.DEFAULT_PUNISH); return; } @@ -135,19 +135,19 @@ public class RequestPostAttachment implements IClientIncomingPacket // Calculate needed slots if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } @@ -194,7 +194,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java index 2ded12e55d..f70e24e74c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java @@ -135,7 +135,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket if ((storePlayer.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL) && (storeList.getItemCount() > _items.size())) { - final String msgErr = "[RequestPrivateStoreBuy] player " + player.getName() + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; + final String msgErr = "[RequestPrivateStoreBuy] " + player + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java index 6ffcc69313..cbf78835a6 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java @@ -65,7 +65,7 @@ public class RequestReceivedPost implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to receive not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to receive not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java index fd6b816fde..04ca270c1d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java @@ -103,13 +103,13 @@ public class RequestRecipeShopListSet implements IClientIncomingPacket final RecipeList list = RecipeData.getInstance().getRecipeList(i.getRecipeId()); 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); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set recipe which he dont have.", Config.DEFAULT_PUNISH); return; } if (i.getCost() > MAX_ADENA) { - Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to set price more than " + MAX_ADENA + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set price more than " + MAX_ADENA + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java index 55c75f0292..ac8373ebdf 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java @@ -49,7 +49,7 @@ public class RequestRecipeShopMessageSet implements IClientIncomingPacket if ((_name != null) && (_name.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java index 1a7c1ebc0f..154c1276dd 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java @@ -77,7 +77,7 @@ public class RequestRejectPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java index 1cf200da52..9f4036d402 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java @@ -64,7 +64,7 @@ public class RequestSentPost implements IClientIncomingPacket if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to read not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to read not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index f17566d545..f3fb47225c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -138,7 +138,7 @@ public class Say2 implements IClientIncomingPacket if (Config.L2WALKER_PROTECTION && (chatType == ChatType.WHISPER) && checkBot(_text)) { - Util.handleIllegalPlayerAction(player, "Client Emulator Detect: Player " + player.getName() + " using l2walker.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Client Emulator Detect: " + player + " using L2Walker.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 13ecd08a96..1c02a4a421 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -109,7 +109,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java index 76e8ac2a68..89261d5490 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java index d86bfc8f84..88e04641cf 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java index 2726f99c08..38de85007e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java @@ -50,7 +50,7 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket if ((_msg != null) && (_msg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index bf64e21529..7def665ec6 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -67,7 +67,7 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); player.sendPacket(ExChangeAttributeFail.STATIC); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionEnchant.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionEnchant.java index d952b3c3c2..fc92769e8b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionEnchant.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionEnchant.java @@ -115,7 +115,7 @@ public class RequestBlessOptionEnchant implements IClientIncomingPacket if (player.getInventory().destroyItem("Blessing", targetScroll.getObjectId(), 1, player, item) == null) { client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to bless with a scroll he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to bless with a scroll he doesn't have", Config.DEFAULT_PUNISH); player.sendPacket(new ExBlessOptionEnchant(EnchantResult.ERROR)); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java index 7eb252c475..7842f646cd 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java @@ -61,35 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning(player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning(player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (15-day) Extension not found in inventory."); return; } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (30-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (30-day) Extension not found in inventory."); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 309ee2193c..6c738675fe 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -132,12 +132,12 @@ public class RequestBRBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index b05865c1ad..57f80a3a2d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -156,12 +156,12 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 13ef62f55f..db6c5307ee 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -61,7 +61,7 @@ public class SellListProcure implements IClientOutgoingPacket packet.writeQ(entry.getValue()); // count packet.writeH(item.getItem().getType2()); packet.writeH(0); // unknown - packet.writeQ(0); // price, u shouldnt get any adena for crops, only raw materials + packet.writeQ(0); // price, you shouldnt get any adena for crops, only raw materials } return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/Evolve.java index 51de657d97..753072b609 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/Evolve.java @@ -62,7 +62,7 @@ public class Evolve final Pet currentPet = (Pet) pet; if (currentPet.isAlikeDead()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); return false; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index 52b1a4ec7e..f4ab3e4904 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -1247,7 +1247,7 @@ public class CastleChamberlain extends AbstractNpcAI } default: { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java index c1404493e1..21dd72f1b3 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java @@ -726,12 +726,12 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader final ClassId newClass = Arrays.stream(ClassId.values()).filter(cid -> player.getClassId() == cid.getParent()).findAny().orElse(null); if (newClass == null) { - LOGGER.warning(getClass().getSimpleName() + ": No new classId found for player " + player); + LOGGER.warning(getClass().getSimpleName() + ": No new classId found for " + player); return false; } else if (newClass == player.getClassId()) { - LOGGER.warning(getClass().getSimpleName() + ": New classId found for player " + player + " is exactly the same as the one he currently is!"); + LOGGER.warning(getClass().getSimpleName() + ": New classId found for " + player + " is exactly the same as the one he currently is!"); return false; } else if (checkIfClassChangeHasOptions(player)) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/bypasshandlers/Link.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/bypasshandlers/Link.java index bd7e222ea4..5097e77f56 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/bypasshandlers/Link.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/bypasshandlers/Link.java @@ -60,13 +60,13 @@ public class Link implements IBypassHandler final String htmlPath = command.substring(4).trim(); if (htmlPath.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty link html!"); + LOGGER.warning(player + " sent empty link html!"); return false; } if (htmlPath.contains("..")) { - LOGGER.warning("Player " + player.getName() + " sent invalid link html: " + htmlPath); + LOGGER.warning(player + " sent invalid link html: " + htmlPath); return false; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/communityboard/ClanBoard.java index 3bfdf86486..a205475a6c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/communityboard/ClanBoard.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/communityboard/ClanBoard.java @@ -77,7 +77,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanList(player, 1); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan list bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan list bypass " + command + "!"); } } } @@ -97,7 +97,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanHome(player); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan home bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan home bypass " + command + "!"); } } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java index dc54e01a0b..df4f03d172 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java @@ -83,7 +83,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for " + player); } } else if (command.startsWith("bbs_add_fav")) @@ -110,7 +110,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for " + player); } } } @@ -134,7 +134,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for " + player); } } return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/communityboard/HomeBoard.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/communityboard/HomeBoard.java index 99074bfdce..5264227778 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/communityboard/HomeBoard.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/communityboard/HomeBoard.java @@ -337,7 +337,7 @@ public class HomeBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for " + player); } return count; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/communityboard/RegionBoard.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/communityboard/RegionBoard.java index 0c5abf5c5a..c6a4392f6a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/communityboard/RegionBoard.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/communityboard/RegionBoard.java @@ -80,7 +80,7 @@ public class RegionBoard implements IWriteBoardHandler final String id = command.replace("_bbsloc;", ""); if (!Util.isDigit(id)) { - LOG.warning(RegionBoard.class.getSimpleName() + ": Player " + player + " sent and invalid region bypass " + command + "!"); + LOG.warning(RegionBoard.class.getSimpleName() + ": " + player + " sent and invalid region bypass " + command + "!"); return false; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/AbstractInstance.java index aad33470bf..d485c2c36d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/AbstractInstance.java @@ -124,7 +124,7 @@ public abstract class AbstractInstance extends AbstractNpcAI final InstanceTemplate template = manager.getInstanceTemplate(templateId); if (template == null) { - LOGGER.warning("Player " + player.getName() + " (" + player.getObjectId() + ") wants to create instance with unknown template id " + templateId + "!"); + LOGGER.warning(player + " wants to create instance with unknown template id " + templateId + "!"); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 73914d140e..e288979088 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -278,7 +278,7 @@ public class MultisellData implements IXmlReader } else { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); return; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index 34c26f1ed0..c9bd4ec11e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -99,7 +99,7 @@ public class AdminCommandHandler implements IHandler 0) { @@ -6755,7 +6755,7 @@ public class Player extends Playable // a possible restart-while-modifysubclass cheat has been attempted. // Switching to use base class player.setClassId(player.getBaseClass()); - LOGGER.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); + LOGGER.warning(player + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); } else { @@ -13073,12 +13073,12 @@ public class Player extends Playable if (nextLevel == -1) { - LOGGER.info("Removing skill " + skill + " from player " + toString()); + LOGGER.info("Removing skill " + skill + " from " + this); removeSkill(skill, true); // there is no lower skill } else { - LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString()); + LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for " + this); addSkill(SkillData.getInstance().getSkill(skill.getId(), nextLevel), true); // replace with lower one } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java index a62c22d7c8..084963b5e5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java @@ -82,7 +82,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -99,7 +99,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -110,7 +110,7 @@ public class Teleporter extends Npc // Check for required count of params. if (st.countTokens() != 2) { - LOGGER.warning("Player " + player.getObjectId() + " send unhandled teleport command: " + command); + LOGGER.warning(player + " send unhandled teleport command: " + command); return; } @@ -118,7 +118,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); + LOGGER.warning(player + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); return; } holder.doTeleport(player, this, parseNextInt(st, -1)); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index 69c35d591f..8bb6102196 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -532,7 +532,7 @@ public class VillageMaster extends Folk */ if (!player.getClient().getFloodProtectors().canChangeSubclass()) { - LOGGER.warning(VillageMaster.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(VillageMaster.class.getName() + ": " + player + " has performed a subclass change too fast"); return; } @@ -592,7 +592,7 @@ public class VillageMaster extends Folk */ if (!player.getClient().getFloodProtectors().canChangeSubclass()) { - LOGGER.warning(VillageMaster.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(VillageMaster.class.getName() + ": " + player + " has performed a subclass change too fast"); return; } @@ -672,7 +672,7 @@ public class VillageMaster extends Folk */ if (!player.getClient().getFloodProtectors().canChangeSubclass()) { - LOGGER.warning(VillageMaster.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(VillageMaster.class.getName() + ": " + player + " has performed a subclass change too fast"); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/quest/Quest.java index 587ec66236..c8b3ca4706 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -1568,7 +1568,7 @@ public class Quest extends AbstractScript implements IIdentifiable final Quest q = QuestManager.getInstance().getQuest(questId); if (q == null) { - LOGGER.finer("Unknown quest " + questId + " for player " + player.getName()); + LOGGER.finer("Unknown quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestData.setInt(1, player.getObjectId()); @@ -1599,7 +1599,7 @@ public class Quest extends AbstractScript implements IIdentifiable final QuestState qs = player.getQuestState(questId); if (qs == null) { - LOGGER.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); + LOGGER.finer("Lost variable " + var + " in quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestDataVar.setInt(1, player.getObjectId()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index 11832b5266..5a0dcbf84a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -135,7 +135,7 @@ public class TeleportHolder { if (isNoblesse() && !player.isNoble()) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } @@ -194,14 +194,14 @@ public class TeleportHolder { if (isNoblesse() && !player.isNoble()) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } final TeleportLocation loc = getLocation(locId); if (loc == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport location " + locId + " within list " + _name + "!"); + LOGGER.warning(player + " requested unknown teleport location " + locId + " within list " + _name + "!"); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index a37e21c83c..ed5d8e88a7 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -111,7 +111,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": " + player + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -128,7 +128,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { // The previous level skill has not been learned. player.sendPacket(SystemMessageId.THE_PREVIOUS_LEVEL_SKILL_HAS_NOT_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } } @@ -155,7 +155,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!canTransform(player)) { player.sendPacket(SystemMessageId.YOU_HAVE_NOT_COMPLETED_THE_NECESSARY_QUEST_FOR_SKILL_ACQUISITION); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); return; } @@ -239,7 +239,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!clan.isLearnableSubPledgeSkill(skill, _subType)) { player.sendPacket(SystemMessageId.THIS_SQUAD_SKILL_HAS_ALREADY_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } @@ -301,7 +301,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -331,7 +331,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -482,7 +482,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (skillLearn.getGetLevel() > player.getLevel()) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_SKILL_LEVEL_REQUIREMENTS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); return false; } @@ -551,7 +551,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { if (!player.destroyItemByItemId("SkillLearn", itemIdCount.getId(), itemIdCount.getCount(), trainer, true)) { - Util.handleIllegalPlayerAction(player, "Somehow player " + player.getName() + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, "Somehow " + player + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); } } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index 6ac4cc7ca0..0b8b67f9a0 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -91,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { player.sendPacket(ActionFailed.STATIC_PACKET); - PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index dd5c90fce2..eb3d8fc0b1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -88,7 +88,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning(player + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -290,7 +290,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (Exception e) { - PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _command + " " + e.getMessage()); + PacketLogger.warning("Exception processing bypass from " + player + ": " + _command + " " + e.getMessage()); if (player.isGM()) { final StringBuilder sb = new StringBuilder(200); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 2a92b7c8f7..c93274d356 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -69,7 +69,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to cancel not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to cancel not own post!", Config.DEFAULT_PUNISH); return; } @@ -121,19 +121,19 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items not from mail !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items not from mail !", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 1f68699a51..0d2a17a608 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -89,7 +89,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info(player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java index 6d59e89936..8685cb4867 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java @@ -77,7 +77,7 @@ public class RequestDeleteReceivedPost implements IClientIncomingPacket } if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java index 88fd8b949d..c4d3846ad7 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java @@ -77,7 +77,7 @@ public class RequestDeleteSentPost implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index dd90488497..ed3cc31a72 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -132,7 +132,7 @@ public class RequestEnchantItem implements IClientIncomingPacket // Lowered value to 500 (from 2000) On Essence, some enchantments are much faster than normal ones. if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 500)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " use autoenchant program ", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -142,7 +142,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", scroll.getObjectId(), 1, player, item) == null) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -152,7 +152,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if ((support != null) && (player.getInventory().destroyItem("Enchant", support.getObjectId(), 1, player, item) == null)) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -361,7 +361,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", item, player, null) == null) { // unable to destroy item, cheater ? - Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from player " + player.getName() + ", possible cheater !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from " + player + ", possible cheater !", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); if (Config.LOG_ITEM_ENCHANTS) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index 6c7d1de201..750e81a43e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -126,7 +126,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket default: { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } } @@ -159,7 +159,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket if (attribute.getType() == opositeElement) { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); return; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java index dc903790d0..27ced7e5f8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java @@ -45,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - PacketLogger.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning(player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); } } \ No newline at end of file diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 29deb5bdc8..bb111e8c17 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -68,7 +68,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 7253226656..0fb3a57829 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -53,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from " + player); } player.sendPacket(ActionFailed.STATIC_PACKET); return; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 79db1768e6..044ebba720 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -51,7 +51,7 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index f51eec948c..b31caa1777 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -76,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " requested Henna Draw remove without any henna."); player.sendPacket(ActionFailed.STATIC_PACKET); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java index 2cdc066ead..f5713d967d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java @@ -50,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty html link!"); + PacketLogger.warning(player + " sent empty html link!"); return; } if (_link.contains("..")) { - PacketLogger.warning("Player " + player.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning(player + " sent invalid html link: link " + _link); return; } final int htmlObjectId = player.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - PacketLogger.warning("Player " + player.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning(player + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index e8de8fee2a..8dae89d3bf 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -86,7 +86,7 @@ public class RequestPackageSend implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 7ffd1afedb..20736eccd4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -108,7 +108,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own attachment!", Config.DEFAULT_PUNISH); return; } @@ -135,19 +135,19 @@ public class RequestPostAttachment implements IClientIncomingPacket // Calculate needed slots if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } @@ -194,7 +194,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java index 2ded12e55d..f70e24e74c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java @@ -135,7 +135,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket if ((storePlayer.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL) && (storeList.getItemCount() > _items.size())) { - final String msgErr = "[RequestPrivateStoreBuy] player " + player.getName() + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; + final String msgErr = "[RequestPrivateStoreBuy] " + player + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java index 6ffcc69313..cbf78835a6 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java @@ -65,7 +65,7 @@ public class RequestReceivedPost implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to receive not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to receive not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java index fd6b816fde..04ca270c1d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java @@ -103,13 +103,13 @@ public class RequestRecipeShopListSet implements IClientIncomingPacket final RecipeList list = RecipeData.getInstance().getRecipeList(i.getRecipeId()); 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); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set recipe which he dont have.", Config.DEFAULT_PUNISH); return; } if (i.getCost() > MAX_ADENA) { - Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to set price more than " + MAX_ADENA + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set price more than " + MAX_ADENA + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java index 55c75f0292..ac8373ebdf 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java @@ -49,7 +49,7 @@ public class RequestRecipeShopMessageSet implements IClientIncomingPacket if ((_name != null) && (_name.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java index 1a7c1ebc0f..154c1276dd 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java @@ -77,7 +77,7 @@ public class RequestRejectPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java index 1cf200da52..9f4036d402 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java @@ -64,7 +64,7 @@ public class RequestSentPost implements IClientIncomingPacket if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to read not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to read not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index f17566d545..f3fb47225c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -138,7 +138,7 @@ public class Say2 implements IClientIncomingPacket if (Config.L2WALKER_PROTECTION && (chatType == ChatType.WHISPER) && checkBot(_text)) { - Util.handleIllegalPlayerAction(player, "Client Emulator Detect: Player " + player.getName() + " using l2walker.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Client Emulator Detect: " + player + " using L2Walker.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 13ecd08a96..1c02a4a421 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -109,7 +109,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java index 76e8ac2a68..89261d5490 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java index d86bfc8f84..88e04641cf 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java index 2726f99c08..38de85007e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java @@ -50,7 +50,7 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket if ((_msg != null) && (_msg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index bf64e21529..7def665ec6 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -67,7 +67,7 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); player.sendPacket(ExChangeAttributeFail.STATIC); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionEnchant.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionEnchant.java index 4c6484d5cf..d013979e3e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionEnchant.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionEnchant.java @@ -115,7 +115,7 @@ public class RequestBlessOptionEnchant implements IClientIncomingPacket if (player.getInventory().destroyItem("Blessing", targetScroll.getObjectId(), 1, player, item) == null) { client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to bless with a scroll he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to bless with a scroll he doesn't have", Config.DEFAULT_PUNISH); player.sendPacket(new ExBlessOptionEnchant(EnchantResult.ERROR)); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java index 7eb252c475..7842f646cd 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java @@ -61,35 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning(player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning(player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (15-day) Extension not found in inventory."); return; } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (30-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (30-day) Extension not found in inventory."); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 309ee2193c..6c738675fe 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -132,12 +132,12 @@ public class RequestBRBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index b05865c1ad..57f80a3a2d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -156,12 +156,12 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 13ef62f55f..db6c5307ee 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -61,7 +61,7 @@ public class SellListProcure implements IClientOutgoingPacket packet.writeQ(entry.getValue()); // count packet.writeH(item.getItem().getType2()); packet.writeH(0); // unknown - packet.writeQ(0); // price, u shouldnt get any adena for crops, only raw materials + packet.writeQ(0); // price, you shouldnt get any adena for crops, only raw materials } return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/Evolve.java index 51de657d97..753072b609 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/Evolve.java @@ -62,7 +62,7 @@ public class Evolve final Pet currentPet = (Pet) pet; if (currentPet.isAlikeDead()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); return false; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index 4a60b88e3c..0861c01908 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -1247,7 +1247,7 @@ public class CastleChamberlain extends AbstractNpcAI } default: { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player.getName() + " (" + player.getObjectId() + ") send unknown request id " + evt.getRequest() + "!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " send unknown request id " + evt.getRequest() + "!"); } } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java index c1404493e1..21dd72f1b3 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java @@ -726,12 +726,12 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader final ClassId newClass = Arrays.stream(ClassId.values()).filter(cid -> player.getClassId() == cid.getParent()).findAny().orElse(null); if (newClass == null) { - LOGGER.warning(getClass().getSimpleName() + ": No new classId found for player " + player); + LOGGER.warning(getClass().getSimpleName() + ": No new classId found for " + player); return false; } else if (newClass == player.getClassId()) { - LOGGER.warning(getClass().getSimpleName() + ": New classId found for player " + player + " is exactly the same as the one he currently is!"); + LOGGER.warning(getClass().getSimpleName() + ": New classId found for " + player + " is exactly the same as the one he currently is!"); return false; } else if (checkIfClassChangeHasOptions(player)) diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/bypasshandlers/Link.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/bypasshandlers/Link.java index bd7e222ea4..5097e77f56 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/bypasshandlers/Link.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/bypasshandlers/Link.java @@ -60,13 +60,13 @@ public class Link implements IBypassHandler final String htmlPath = command.substring(4).trim(); if (htmlPath.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty link html!"); + LOGGER.warning(player + " sent empty link html!"); return false; } if (htmlPath.contains("..")) { - LOGGER.warning("Player " + player.getName() + " sent invalid link html: " + htmlPath); + LOGGER.warning(player + " sent invalid link html: " + htmlPath); return false; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/communityboard/ClanBoard.java index 3bfdf86486..a205475a6c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/communityboard/ClanBoard.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/communityboard/ClanBoard.java @@ -77,7 +77,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanList(player, 1); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan list bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan list bypass " + command + "!"); } } } @@ -97,7 +97,7 @@ public class ClanBoard implements IWriteBoardHandler catch (Exception e) { clanHome(player); - LOG.warning(ClanBoard.class.getSimpleName() + ": Player " + player + " send invalid clan home bypass " + command + "!"); + LOG.warning(ClanBoard.class.getSimpleName() + ": " + player + " send invalid clan home bypass " + command + "!"); } } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java index dc54e01a0b..df4f03d172 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java @@ -83,7 +83,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't load favorite links for " + player); } } else if (command.startsWith("bbs_add_fav")) @@ -110,7 +110,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't add favorite link " + bypass + " for " + player); } } } @@ -134,7 +134,7 @@ public class FavoriteBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Couldn't delete favorite link ID " + favId + " for " + player); } } return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/communityboard/HomeBoard.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/communityboard/HomeBoard.java index 99074bfdce..5264227778 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/communityboard/HomeBoard.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/communityboard/HomeBoard.java @@ -337,7 +337,7 @@ public class HomeBoard implements IParseBoardHandler } catch (Exception e) { - LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for player " + player.getName()); + LOG.warning(FavoriteBoard.class.getSimpleName() + ": Coudn't load favorites count for " + player); } return count; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/communityboard/RegionBoard.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/communityboard/RegionBoard.java index 0c5abf5c5a..c6a4392f6a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/communityboard/RegionBoard.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/communityboard/RegionBoard.java @@ -80,7 +80,7 @@ public class RegionBoard implements IWriteBoardHandler final String id = command.replace("_bbsloc;", ""); if (!Util.isDigit(id)) { - LOG.warning(RegionBoard.class.getSimpleName() + ": Player " + player + " sent and invalid region bypass " + command + "!"); + LOG.warning(RegionBoard.class.getSimpleName() + ": " + player + " sent and invalid region bypass " + command + "!"); return false; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/instances/AbstractInstance.java index df014e3783..4b40e5f74c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/instances/AbstractInstance.java @@ -124,7 +124,7 @@ public abstract class AbstractInstance extends AbstractNpcAI final InstanceTemplate template = manager.getInstanceTemplate(templateId); if (template == null) { - LOGGER.warning("Player " + player.getName() + " (" + player.getObjectId() + ") wants to create instance with unknown template id " + templateId + "!"); + LOGGER.warning(player + " wants to create instance with unknown template id " + templateId + "!"); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 73914d140e..e288979088 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -278,7 +278,7 @@ public class MultisellData implements IXmlReader } else { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); + LOGGER.warning(getClass().getSimpleName() + ": " + player + " attempted to open multisell " + listId + " from npc " + npc + " which is not allowed!"); return; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index 34c26f1ed0..c9bd4ec11e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -99,7 +99,7 @@ public class AdminCommandHandler implements IHandler 0) { @@ -6755,7 +6755,7 @@ public class Player extends Playable // a possible restart-while-modifysubclass cheat has been attempted. // Switching to use base class player.setClassId(player.getBaseClass()); - LOGGER.warning("Player " + player.getName() + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); + LOGGER.warning(player + " reverted to base class. Possibly has tried a relogin exploit while subclassing."); } else { @@ -13073,12 +13073,12 @@ public class Player extends Playable if (nextLevel == -1) { - LOGGER.info("Removing skill " + skill + " from player " + toString()); + LOGGER.info("Removing skill " + skill + " from " + this); removeSkill(skill, true); // there is no lower skill } else { - LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for player " + toString()); + LOGGER.info("Decreasing skill " + skill + " to " + nextLevel + " for " + this); addSkill(SkillData.getInstance().getSkill(skill.getId(), nextLevel), true); // replace with lower one } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java index a62c22d7c8..084963b5e5 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/Teleporter.java @@ -82,7 +82,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -99,7 +99,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); + LOGGER.warning(player + " requested show teleports for hunting list with name " + listName + " at NPC " + getId() + "!"); return; } holder.showTeleportList(player, this); @@ -110,7 +110,7 @@ public class Teleporter extends Npc // Check for required count of params. if (st.countTokens() != 2) { - LOGGER.warning("Player " + player.getObjectId() + " send unhandled teleport command: " + command); + LOGGER.warning(player + " send unhandled teleport command: " + command); return; } @@ -118,7 +118,7 @@ public class Teleporter extends Npc final TeleportHolder holder = TeleporterData.getInstance().getHolder(getId(), listName); if (holder == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); + LOGGER.warning(player + " requested unknown teleport list: " + listName + " for npc: " + getId() + "!"); return; } holder.doTeleport(player, this, parseNextInt(st, -1)); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index c7132f788b..5c4e410c17 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -532,7 +532,7 @@ public class VillageMaster extends Folk */ if (!player.getClient().getFloodProtectors().canChangeSubclass()) { - LOGGER.warning(VillageMaster.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(VillageMaster.class.getName() + ": " + player + " has performed a subclass change too fast"); return; } @@ -592,7 +592,7 @@ public class VillageMaster extends Folk */ if (!player.getClient().getFloodProtectors().canChangeSubclass()) { - LOGGER.warning(VillageMaster.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(VillageMaster.class.getName() + ": " + player + " has performed a subclass change too fast"); return; } @@ -672,7 +672,7 @@ public class VillageMaster extends Folk */ if (!player.getClient().getFloodProtectors().canChangeSubclass()) { - LOGGER.warning(VillageMaster.class.getName() + ": Player " + player.getName() + " has performed a subclass change too fast"); + LOGGER.warning(VillageMaster.class.getName() + ": " + player + " has performed a subclass change too fast"); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/quest/Quest.java index 587ec66236..c8b3ca4706 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -1568,7 +1568,7 @@ public class Quest extends AbstractScript implements IIdentifiable final Quest q = QuestManager.getInstance().getQuest(questId); if (q == null) { - LOGGER.finer("Unknown quest " + questId + " for player " + player.getName()); + LOGGER.finer("Unknown quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestData.setInt(1, player.getObjectId()); @@ -1599,7 +1599,7 @@ public class Quest extends AbstractScript implements IIdentifiable final QuestState qs = player.getQuestState(questId); if (qs == null) { - LOGGER.finer("Lost variable " + var + " in quest " + questId + " for player " + player.getName()); + LOGGER.finer("Lost variable " + var + " in quest " + questId + " for " + player); if (Config.AUTODELETE_INVALID_QUEST_DATA) { invalidQuestDataVar.setInt(1, player.getObjectId()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index e36b893d2d..c24df5f7f4 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -135,7 +135,7 @@ public class TeleportHolder { if (isNoblesse() && !player.isNoble()) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } @@ -194,14 +194,14 @@ public class TeleportHolder { if (isNoblesse() && !player.isNoble()) { - LOGGER.warning("Player " + player.getObjectId() + " requested noblesse teleport without being noble!"); + LOGGER.warning(player + " requested noblesse teleport without being noble!"); return; } final TeleportLocation loc = getLocation(locId); if (loc == null) { - LOGGER.warning("Player " + player.getObjectId() + " requested unknown teleport location " + locId + " within list " + _name + "!"); + LOGGER.warning(player + " requested unknown teleport location " + locId + " within list " + _name + "!"); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index acfb88875c..c589d7a18d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -111,7 +111,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": " + player + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -128,7 +128,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { // The previous level skill has not been learned. player.sendPacket(SystemMessageId.THE_PREVIOUS_LEVEL_SKILL_HAS_NOT_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } } @@ -155,7 +155,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!canTransform(player)) { player.sendPacket(SystemMessageId.YOU_HAVE_NOT_COMPLETED_THE_NECESSARY_QUEST_FOR_SKILL_ACQUISITION); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE); return; } @@ -239,7 +239,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (!clan.isLearnableSubPledgeSkill(skill, _subType)) { player.sendPacket(SystemMessageId.THIS_SQUAD_SKILL_HAS_ALREADY_BEEN_LEARNED); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!", IllegalActionPunishmentType.NONE); return; } @@ -301,7 +301,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -331,7 +331,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (player.isSubClassActive()) { player.sendPacket(SystemMessageId.THIS_SKILL_CANNOT_BE_LEARNED_WHILE_IN_THE_SUBCLASS_STATE_PLEASE_TRY_AGAIN_AFTER_CHANGING_TO_THE_MAIN_CLASS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!", IllegalActionPunishmentType.NONE); return; } @@ -482,7 +482,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if (skillLearn.getGetLevel() > player.getLevel()) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_SKILL_LEVEL_REQUIREMENTS); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, player + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + skillLearn.getGetLevel() + "!", IllegalActionPunishmentType.NONE); return false; } @@ -551,7 +551,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket { if (!player.destroyItemByItemId("SkillLearn", itemIdCount.getId(), itemIdCount.getCount(), trainer, true)) { - Util.handleIllegalPlayerAction(player, "Somehow player " + player.getName() + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); + Util.handleIllegalPlayerAction(player, "Somehow " + player + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level + "!", IllegalActionPunishmentType.NONE); } } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index 6ac4cc7ca0..0b8b67f9a0 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -91,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { player.sendPacket(ActionFailed.STATIC_PACKET); - PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning(player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index dd5c90fce2..eb3d8fc0b1 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -88,7 +88,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning(player + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -290,7 +290,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (Exception e) { - PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _command + " " + e.getMessage()); + PacketLogger.warning("Exception processing bypass from " + player + ": " + _command + " " + e.getMessage()); if (player.isGM()) { final StringBuilder sb = new StringBuilder(200); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index ed21506872..fd38754375 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -69,7 +69,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to cancel not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to cancel not own post!", Config.DEFAULT_PUNISH); return; } @@ -121,19 +121,19 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own item from cancelled attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items not from mail !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items not from mail !", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 5ed1f76e10..2bee4a447f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -89,7 +89,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info(player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java index 21e2ae8b00..894174cbd9 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java @@ -77,7 +77,7 @@ public class RequestDeleteReceivedPost implements IClientIncomingPacket } if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java index e1a9e5a5b8..ce7104edc0 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java @@ -77,7 +77,7 @@ public class RequestDeleteSentPost implements IClientIncomingPacket } if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to delete not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to delete not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index b3141a72f2..fb8c12e658 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -132,7 +132,7 @@ public class RequestEnchantItem implements IClientIncomingPacket // Lowered value to 500 (from 2000) On Essence, some enchantments are much faster than normal ones. if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 500)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " use autoenchant program ", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -142,7 +142,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", scroll.getObjectId(), 1, player, item) == null) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -152,7 +152,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if ((support != null) && (player.getInventory().destroyItem("Enchant", support.getObjectId(), 1, player, item) == null)) { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); return; @@ -361,7 +361,7 @@ public class RequestEnchantItem implements IClientIncomingPacket if (player.getInventory().destroyItem("Enchant", item, player, null) == null) { // unable to destroy item, cheater ? - Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from player " + player.getName() + ", possible cheater !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Unable to delete item on enchant failure from " + player + ", possible cheater !", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); player.sendPacket(new EnchantResult(EnchantResult.ERROR, 0, 0)); if (Config.LOG_ITEM_ENCHANTS) diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index 6c7d1de201..750e81a43e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -126,7 +126,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket default: { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } } @@ -159,7 +159,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket if (attribute.getType() == opositeElement) { player.removeRequest(request.getClass()); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH); return; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java index dc903790d0..27ced7e5f8 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java @@ -45,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - PacketLogger.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning(player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); } } \ No newline at end of file diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 073de9bb9e..7889623fc9 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -68,7 +68,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 7253226656..0fb3a57829 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -53,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from " + player); } player.sendPacket(ActionFailed.STATIC_PACKET); return; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 79db1768e6..044ebba720 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -51,7 +51,7 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from " + player); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index f680c87f2c..bfbe07c05b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -76,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " requested Henna Draw remove without any henna."); player.sendPacket(ActionFailed.STATIC_PACKET); } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java index 2cdc066ead..f5713d967d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java @@ -50,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - PacketLogger.warning("Player " + player.getName() + " sent empty html link!"); + PacketLogger.warning(player + " sent empty html link!"); return; } if (_link.contains("..")) { - PacketLogger.warning("Player " + player.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning(player + " sent invalid html link: link " + _link); return; } final int htmlObjectId = player.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - PacketLogger.warning("Player " + player.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning(player + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 5de7926bb0..aef8ae680f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -86,7 +86,7 @@ public class RequestPackageSend implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 7ffd1afedb..20736eccd4 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -108,7 +108,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get not own attachment!", Config.DEFAULT_PUNISH); return; } @@ -135,19 +135,19 @@ public class RequestPostAttachment implements IClientIncomingPacket // Calculate needed slots if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (ownerId != senderId) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getItemLocation() != ItemLocation.MAIL) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get wrong item (Location != MAIL) from attachment!", Config.DEFAULT_PUNISH); return; } if (item.getLocationSlot() != msg.getId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items from different attachment!", Config.DEFAULT_PUNISH); return; } @@ -194,7 +194,7 @@ public class RequestPostAttachment implements IClientIncomingPacket if (item.getOwnerId() != msg.getSenderId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to get items with owner != sender !", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java index 2ded12e55d..f70e24e74c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java @@ -135,7 +135,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket if ((storePlayer.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL) && (storeList.getItemCount() > _items.size())) { - final String msgErr = "[RequestPrivateStoreBuy] player " + player.getName() + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; + final String msgErr = "[RequestPrivateStoreBuy] " + player + " tried to buy less items than sold by package-sell, ban this player for bot usage!"; Util.handleIllegalPlayerAction(player, msgErr, Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java index bf72d4a94a..8eb416e456 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java @@ -65,7 +65,7 @@ public class RequestReceivedPost implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to receive not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to receive not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java index fd6b816fde..04ca270c1d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java @@ -103,13 +103,13 @@ public class RequestRecipeShopListSet implements IClientIncomingPacket final RecipeList list = RecipeData.getInstance().getRecipeList(i.getRecipeId()); 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); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set recipe which he dont have.", Config.DEFAULT_PUNISH); return; } if (i.getCost() > MAX_ADENA) { - Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to set price more than " + MAX_ADENA + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Warning!! " + player + " of account " + player.getAccountName() + " tried to set price more than " + MAX_ADENA + " adena in Private Manufacture.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java index 55c75f0292..ac8373ebdf 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java @@ -49,7 +49,7 @@ public class RequestRecipeShopMessageSet implements IClientIncomingPacket if ((_name != null) && (_name.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow recipe shop message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java index bca101a05e..c86df54b61 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java @@ -77,7 +77,7 @@ public class RequestRejectPostAttachment implements IClientIncomingPacket if (msg.getReceiverId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to reject not own attachment!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java index 0022d13f9e..2ab5c8c559 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java @@ -64,7 +64,7 @@ public class RequestSentPost implements IClientIncomingPacket if (msg.getSenderId() != player.getObjectId()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to read not own post!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to read not own post!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 94a7286aa6..97d91686cf 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -138,7 +138,7 @@ public class Say2 implements IClientIncomingPacket if (Config.L2WALKER_PROTECTION && (chatType == ChatType.WHISPER) && checkBot(_text)) { - Util.handleIllegalPlayerAction(player, "Client Emulator Detect: Player " + player.getName() + " using l2walker.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, "Client Emulator Detect: " + player + " using L2Walker.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 9ca8059f1d..e64b7c89a8 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -109,7 +109,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket if (player.hasItemRequest()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java index 76e8ac2a68..89261d5490 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgBuy implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store buy message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java index d86bfc8f84..88e04641cf 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java @@ -50,7 +50,7 @@ public class SetPrivateStoreMsgSell implements IClientIncomingPacket if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store sell message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java index 2726f99c08..38de85007e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java @@ -50,7 +50,7 @@ public class SetPrivateStoreWholeMsg implements IClientIncomingPacket if ((_msg != null) && (_msg.length() > MAX_MSG_LENGTH)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to overflow private store whole message", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index bf64e21529..7def665ec6 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -67,7 +67,7 @@ public class RequestChangeAttributeItem implements IClientIncomingPacket { player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); player.sendPacket(ExChangeAttributeFail.STATIC); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to change attribute without an attribute change crystal.", Config.DEFAULT_PUNISH); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionEnchant.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionEnchant.java index 4c6484d5cf..d013979e3e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionEnchant.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionEnchant.java @@ -115,7 +115,7 @@ public class RequestBlessOptionEnchant implements IClientIncomingPacket if (player.getInventory().destroyItem("Blessing", targetScroll.getObjectId(), 1, player, item) == null) { client.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to bless with a scroll he doesn't have", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to bless with a scroll he doesn't have", Config.DEFAULT_PUNISH); player.sendPacket(new ExBlessOptionEnchant(EnchantResult.ERROR)); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java index 7eb252c475..7842f646cd 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java @@ -61,35 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning(player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); + PacketLogger.warning(player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning(player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (15-day) Extension not found in inventory."); return; } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - PacketLogger.warning("Player " + player + ": Auction House (30-day) Extension not found in inventory."); + PacketLogger.warning(player + ": Auction House (30-day) Extension not found in inventory."); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 309ee2193c..6c738675fe 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -132,12 +132,12 @@ public class RequestBRBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index b05865c1ad..57f80a3a2d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -156,12 +156,12 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid brId from Prime", Config.DEFAULT_PUNISH); return false; } else if ((count < 1) || (count > 99)) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to buy invalid itemcount [" + count + "] from Prime", Config.DEFAULT_PUNISH); player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_USER_STATE)); return false; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 13ef62f55f..db6c5307ee 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -61,7 +61,7 @@ public class SellListProcure implements IClientOutgoingPacket packet.writeQ(entry.getValue()); // count packet.writeH(item.getItem().getType2()); packet.writeH(0); // unknown - packet.writeQ(0); // price, u shouldnt get any adena for crops, only raw materials + packet.writeQ(0); // price, you shouldnt get any adena for crops, only raw materials } return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/util/Evolve.java index 51de657d97..753072b609 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/util/Evolve.java @@ -62,7 +62,7 @@ public class Evolve final Pet currentPet = (Pet) pet; if (currentPet.isAlikeDead()) { - Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); + Util.handleIllegalPlayerAction(player, player + " tried to use death pet exploit!", Config.DEFAULT_PUNISH); return false; }