From e438ab17767fdaea1fd1035f0abc2d1ba5f82e7f Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 8 Dec 2021 02:37:47 +0000 Subject: [PATCH] Addition of PacketLogger class. --- .../gameserver/network/PacketLogger.java | 42 ++++++++++++++++ .../network/clientpackets/Action.java | 3 +- .../network/clientpackets/AddTradeItem.java | 5 +- .../clientpackets/CannotMoveAnymore.java | 2 +- .../clientpackets/CharacterCreate.java | 9 ++-- .../clientpackets/CharacterDelete.java | 5 +- .../network/clientpackets/EndScenePlayer.java | 2 +- .../network/clientpackets/EnterWorld.java | 3 +- .../network/clientpackets/ExGetOnAirShip.java | 12 +++-- .../network/clientpackets/GameGuardReply.java | 4 +- .../clientpackets/IClientIncomingPacket.java | 3 -- .../clientpackets/MultiSellChoose.java | 13 ++--- .../clientpackets/RequestAcquireSkill.java | 7 +-- .../RequestAcquireSkillInfo.java | 5 +- .../clientpackets/RequestActionUse.java | 10 ++-- .../network/clientpackets/RequestBlock.java | 3 +- .../network/clientpackets/RequestBuyItem.java | 3 +- .../clientpackets/RequestBypassToServer.java | 10 ++-- .../clientpackets/RequestCrystallizeItem.java | 5 +- .../clientpackets/RequestDestroyItem.java | 4 +- .../clientpackets/RequestDropItem.java | 3 +- .../clientpackets/RequestExChangeName.java | 3 +- .../RequestExCubeGameChangeTeam.java | 3 +- .../RequestExCubeGameReadyAnswer.java | 3 +- .../clientpackets/RequestExFishRanking.java | 3 +- .../RequestExMagicSkillUseGround.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestFortressMapInfo.java | 3 +- .../clientpackets/RequestGetBossRecord.java | 3 +- .../clientpackets/RequestGetItemFromPet.java | 3 +- .../clientpackets/RequestGiveItemToPet.java | 3 +- .../clientpackets/RequestHennaEquip.java | 3 +- .../clientpackets/RequestHennaItemInfo.java | 3 +- .../RequestHennaItemRemoveInfo.java | 4 +- .../clientpackets/RequestHennaRemove.java | 3 +- .../clientpackets/RequestLinkHtml.java | 7 +-- .../clientpackets/RequestMagicSkillList.java | 3 +- .../clientpackets/RequestMagicSkillUse.java | 2 +- .../RequestOustPledgeMember.java | 3 +- .../clientpackets/RequestPCCafeCouponUse.java | 3 +- .../clientpackets/RequestPackageSend.java | 7 +-- .../clientpackets/RequestPetUseItem.java | 3 +- .../RequestPetitionFeedback.java | 3 +- .../RequestPledgeMemberInfo.java | 4 +- .../clientpackets/RequestPreviewItem.java | 6 +-- .../clientpackets/RequestPrivateStoreBuy.java | 3 +- .../RequestPrivateStoreSell.java | 3 +- .../clientpackets/RequestRefundItem.java | 3 +- .../RequestReplySurrenderPledgeWar.java | 3 +- .../clientpackets/RequestRestartPoint.java | 11 +++-- .../clientpackets/RequestSendPost.java | 5 +- .../RequestSetCastleSiegeTime.java | 11 +++-- .../network/clientpackets/Say2.java | 11 +++-- .../SendWareHouseDepositList.java | 7 +-- .../SendWareHouseWithDrawList.java | 5 +- .../network/clientpackets/UseItem.java | 3 +- .../ability/RequestAcquireAbilityList.java | 17 +++---- .../alchemy/RequestAlchemyConversion.java | 5 +- .../alchemy/RequestAlchemyTryMixCube.java | 3 +- .../commission/RequestCommissionRegister.java | 15 +++--- .../RequestCrystallizeEstimate.java | 3 +- .../friend/RequestAnswerFriendInvite.java | 4 +- .../friend/RequestFriendDel.java | 4 +- .../mentoring/ConfirmMenteeAdd.java | 4 +- .../primeshop/RequestBRProductList.java | 3 +- .../sayune/RequestFlyMoveStart.java | 5 +- .../shuttle/RequestShuttleGetOn.java | 3 +- .../serverpackets/AbstractHtmlPacket.java | 7 ++- .../serverpackets/ExReplyReceivedPost.java | 3 +- .../serverpackets/ExReplySentPost.java | 3 +- .../serverpackets/ExShowCastleInfo.java | 3 +- .../serverpackets/IClientOutgoingPacket.java | 4 -- .../PledgeReceiveSubPledgeCreated.java | 3 +- .../serverpackets/RecipeItemMakeInfo.java | 4 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SystemMessage.java | 5 +- .../WareHouseWithdrawalList.java | 3 +- .../gameserver/network/PacketLogger.java | 42 ++++++++++++++++ .../network/clientpackets/Action.java | 3 +- .../network/clientpackets/AddTradeItem.java | 5 +- .../clientpackets/CannotMoveAnymore.java | 2 +- .../clientpackets/CharacterCreate.java | 9 ++-- .../clientpackets/CharacterDelete.java | 5 +- .../network/clientpackets/EndScenePlayer.java | 2 +- .../network/clientpackets/EnterWorld.java | 3 +- .../network/clientpackets/ExGetOnAirShip.java | 12 +++-- .../network/clientpackets/GameGuardReply.java | 4 +- .../clientpackets/IClientIncomingPacket.java | 3 -- .../clientpackets/MultiSellChoose.java | 15 +++--- .../clientpackets/RequestAcquireSkill.java | 7 +-- .../RequestAcquireSkillInfo.java | 5 +- .../clientpackets/RequestActionUse.java | 10 ++-- .../network/clientpackets/RequestBlock.java | 3 +- .../network/clientpackets/RequestBuyItem.java | 3 +- .../clientpackets/RequestBypassToServer.java | 10 ++-- .../clientpackets/RequestCrystallizeItem.java | 5 +- .../clientpackets/RequestDestroyItem.java | 4 +- .../clientpackets/RequestDropItem.java | 3 +- .../clientpackets/RequestExChangeName.java | 3 +- .../RequestExCubeGameChangeTeam.java | 3 +- .../RequestExCubeGameReadyAnswer.java | 3 +- .../clientpackets/RequestExFishRanking.java | 3 +- .../RequestExMagicSkillUseGround.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestFortressMapInfo.java | 3 +- .../clientpackets/RequestGetBossRecord.java | 3 +- .../clientpackets/RequestGetItemFromPet.java | 3 +- .../clientpackets/RequestGiveItemToPet.java | 3 +- .../clientpackets/RequestHennaEquip.java | 3 +- .../clientpackets/RequestHennaItemInfo.java | 3 +- .../RequestHennaItemRemoveInfo.java | 4 +- .../clientpackets/RequestHennaRemove.java | 3 +- .../clientpackets/RequestLinkHtml.java | 7 +-- .../clientpackets/RequestMagicSkillList.java | 3 +- .../clientpackets/RequestMagicSkillUse.java | 2 +- .../RequestOustPledgeMember.java | 3 +- .../clientpackets/RequestPCCafeCouponUse.java | 3 +- .../clientpackets/RequestPackageSend.java | 7 +-- .../clientpackets/RequestPetUseItem.java | 3 +- .../RequestPetitionFeedback.java | 3 +- .../RequestPledgeMemberInfo.java | 4 +- .../clientpackets/RequestPreviewItem.java | 6 +-- .../clientpackets/RequestPrivateStoreBuy.java | 3 +- .../RequestPrivateStoreSell.java | 3 +- .../clientpackets/RequestRefundItem.java | 3 +- .../RequestReplySurrenderPledgeWar.java | 3 +- .../clientpackets/RequestRestartPoint.java | 11 +++-- .../clientpackets/RequestSendPost.java | 5 +- .../RequestSetCastleSiegeTime.java | 11 +++-- .../network/clientpackets/Say2.java | 11 +++-- .../SendWareHouseDepositList.java | 7 +-- .../SendWareHouseWithDrawList.java | 5 +- .../network/clientpackets/UseItem.java | 3 +- .../ability/RequestAcquireAbilityList.java | 17 +++---- .../alchemy/RequestAlchemyConversion.java | 5 +- .../alchemy/RequestAlchemyTryMixCube.java | 3 +- .../commission/RequestCommissionRegister.java | 15 +++--- .../RequestCrystallizeEstimate.java | 3 +- .../RequestOneDayRewardReceive.java | 3 +- .../ensoul/RequestItemEnsoul.java | 26 +++++----- .../friend/RequestAnswerFriendInvite.java | 4 +- .../friend/RequestFriendDel.java | 4 +- .../mentoring/ConfirmMenteeAdd.java | 4 +- .../pledgebonus/RequestPledgeBonusReward.java | 3 +- .../primeshop/RequestBRProductList.java | 3 +- .../sayune/RequestFlyMoveStart.java | 5 +- .../shuttle/RequestShuttleGetOn.java | 3 +- .../serverpackets/AbstractHtmlPacket.java | 7 ++- .../serverpackets/ExReplyReceivedPost.java | 3 +- .../serverpackets/ExReplySentPost.java | 3 +- .../serverpackets/ExShowCastleInfo.java | 3 +- .../serverpackets/IClientOutgoingPacket.java | 4 -- .../PledgeReceiveSubPledgeCreated.java | 3 +- .../serverpackets/RecipeItemMakeInfo.java | 4 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SystemMessage.java | 5 +- .../WareHouseWithdrawalList.java | 3 +- .../gameserver/network/PacketLogger.java | 42 ++++++++++++++++ .../network/clientpackets/Action.java | 3 +- .../network/clientpackets/AddTradeItem.java | 5 +- .../clientpackets/CannotMoveAnymore.java | 2 +- .../clientpackets/CharacterCreate.java | 9 ++-- .../clientpackets/CharacterDelete.java | 5 +- .../network/clientpackets/EndScenePlayer.java | 2 +- .../network/clientpackets/EnterWorld.java | 3 +- .../network/clientpackets/ExGetOnAirShip.java | 12 +++-- .../network/clientpackets/GameGuardReply.java | 4 +- .../clientpackets/IClientIncomingPacket.java | 3 -- .../clientpackets/MultiSellChoose.java | 15 +++--- .../clientpackets/RequestAcquireSkill.java | 7 +-- .../RequestAcquireSkillInfo.java | 5 +- .../clientpackets/RequestActionUse.java | 10 ++-- .../network/clientpackets/RequestBlock.java | 3 +- .../network/clientpackets/RequestBuyItem.java | 3 +- .../clientpackets/RequestBypassToServer.java | 10 ++-- .../clientpackets/RequestCrystallizeItem.java | 5 +- .../clientpackets/RequestDestroyItem.java | 4 +- .../clientpackets/RequestDropItem.java | 3 +- .../clientpackets/RequestExChangeName.java | 3 +- .../RequestExCubeGameChangeTeam.java | 3 +- .../RequestExCubeGameReadyAnswer.java | 3 +- .../clientpackets/RequestExFishRanking.java | 3 +- .../RequestExMagicSkillUseGround.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestFortressMapInfo.java | 3 +- .../clientpackets/RequestGetBossRecord.java | 3 +- .../clientpackets/RequestGetItemFromPet.java | 3 +- .../clientpackets/RequestGiveItemToPet.java | 3 +- .../clientpackets/RequestHennaEquip.java | 3 +- .../clientpackets/RequestHennaItemInfo.java | 3 +- .../RequestHennaItemRemoveInfo.java | 4 +- .../clientpackets/RequestHennaRemove.java | 3 +- .../clientpackets/RequestLinkHtml.java | 7 +-- .../clientpackets/RequestMagicSkillList.java | 3 +- .../clientpackets/RequestMagicSkillUse.java | 2 +- .../RequestOustPledgeMember.java | 3 +- .../clientpackets/RequestPCCafeCouponUse.java | 3 +- .../clientpackets/RequestPackageSend.java | 7 +-- .../clientpackets/RequestPetUseItem.java | 3 +- .../RequestPetitionFeedback.java | 3 +- .../RequestPledgeMemberInfo.java | 4 +- .../clientpackets/RequestPreviewItem.java | 6 +-- .../clientpackets/RequestPrivateStoreBuy.java | 3 +- .../RequestPrivateStoreSell.java | 3 +- .../clientpackets/RequestRefundItem.java | 3 +- .../RequestReplySurrenderPledgeWar.java | 3 +- .../clientpackets/RequestRestartPoint.java | 11 +++-- .../clientpackets/RequestSendPost.java | 5 +- .../RequestSetCastleSiegeTime.java | 11 +++-- .../network/clientpackets/Say2.java | 11 +++-- .../SendWareHouseDepositList.java | 7 +-- .../SendWareHouseWithDrawList.java | 5 +- .../network/clientpackets/UseItem.java | 3 +- .../ability/RequestAcquireAbilityList.java | 17 +++---- .../alchemy/RequestAlchemyConversion.java | 5 +- .../alchemy/RequestAlchemyTryMixCube.java | 3 +- .../commission/RequestCommissionRegister.java | 15 +++--- .../RequestCrystallizeEstimate.java | 3 +- .../RequestOneDayRewardReceive.java | 3 +- .../ensoul/RequestItemEnsoul.java | 26 +++++----- .../friend/RequestAnswerFriendInvite.java | 4 +- .../friend/RequestFriendDel.java | 4 +- .../mentoring/ConfirmMenteeAdd.java | 4 +- .../pledgebonus/RequestPledgeBonusReward.java | 3 +- .../primeshop/RequestBRProductList.java | 3 +- .../sayune/RequestFlyMoveStart.java | 5 +- .../shuttle/RequestShuttleGetOn.java | 3 +- .../serverpackets/AbstractHtmlPacket.java | 7 ++- .../serverpackets/ExReplyReceivedPost.java | 3 +- .../serverpackets/ExReplySentPost.java | 3 +- .../serverpackets/ExShowCastleInfo.java | 3 +- .../serverpackets/IClientOutgoingPacket.java | 4 -- .../PledgeReceiveSubPledgeCreated.java | 3 +- .../serverpackets/RecipeItemMakeInfo.java | 4 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SystemMessage.java | 5 +- .../WareHouseWithdrawalList.java | 3 +- .../gameserver/network/PacketLogger.java | 42 ++++++++++++++++ .../network/clientpackets/Action.java | 3 +- .../network/clientpackets/AddTradeItem.java | 5 +- .../clientpackets/CannotMoveAnymore.java | 2 +- .../clientpackets/CharacterCreate.java | 9 ++-- .../clientpackets/CharacterDelete.java | 5 +- .../network/clientpackets/EndScenePlayer.java | 2 +- .../network/clientpackets/EnterWorld.java | 3 +- .../network/clientpackets/ExGetOnAirShip.java | 12 +++-- .../network/clientpackets/GameGuardReply.java | 4 +- .../clientpackets/IClientIncomingPacket.java | 3 -- .../clientpackets/MultiSellChoose.java | 15 +++--- .../clientpackets/RequestAcquireSkill.java | 7 +-- .../RequestAcquireSkillInfo.java | 5 +- .../clientpackets/RequestActionUse.java | 10 ++-- .../network/clientpackets/RequestBlock.java | 3 +- .../network/clientpackets/RequestBuyItem.java | 3 +- .../clientpackets/RequestBypassToServer.java | 10 ++-- .../clientpackets/RequestCrystallizeItem.java | 5 +- .../clientpackets/RequestDestroyItem.java | 4 +- .../clientpackets/RequestDropItem.java | 3 +- .../clientpackets/RequestExChangeName.java | 3 +- .../RequestExCubeGameChangeTeam.java | 3 +- .../RequestExCubeGameReadyAnswer.java | 3 +- .../clientpackets/RequestExFishRanking.java | 3 +- .../RequestExMagicSkillUseGround.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestFortressMapInfo.java | 3 +- .../clientpackets/RequestGetBossRecord.java | 3 +- .../clientpackets/RequestGetItemFromPet.java | 3 +- .../clientpackets/RequestGiveItemToPet.java | 3 +- .../clientpackets/RequestHennaEquip.java | 3 +- .../clientpackets/RequestHennaItemInfo.java | 3 +- .../RequestHennaItemRemoveInfo.java | 4 +- .../clientpackets/RequestHennaRemove.java | 3 +- .../clientpackets/RequestLinkHtml.java | 7 +-- .../clientpackets/RequestMagicSkillList.java | 3 +- .../clientpackets/RequestMagicSkillUse.java | 2 +- .../RequestOustPledgeMember.java | 3 +- .../clientpackets/RequestPCCafeCouponUse.java | 3 +- .../clientpackets/RequestPackageSend.java | 7 +-- .../clientpackets/RequestPetUseItem.java | 3 +- .../RequestPetitionFeedback.java | 3 +- .../RequestPledgeMemberInfo.java | 4 +- .../clientpackets/RequestPreviewItem.java | 6 +-- .../clientpackets/RequestPrivateStoreBuy.java | 3 +- .../RequestPrivateStoreSell.java | 3 +- .../clientpackets/RequestRefundItem.java | 3 +- .../RequestReplySurrenderPledgeWar.java | 3 +- .../clientpackets/RequestRestartPoint.java | 11 +++-- .../clientpackets/RequestSendPost.java | 5 +- .../RequestSetCastleSiegeTime.java | 11 +++-- .../network/clientpackets/Say2.java | 11 +++-- .../SendWareHouseDepositList.java | 7 +-- .../SendWareHouseWithDrawList.java | 5 +- .../network/clientpackets/UseItem.java | 3 +- .../ability/RequestAcquireAbilityList.java | 17 +++---- .../alchemy/RequestAlchemyConversion.java | 5 +- .../alchemy/RequestAlchemyTryMixCube.java | 3 +- .../commission/RequestCommissionRegister.java | 15 +++--- .../RequestCrystallizeEstimate.java | 3 +- .../RequestOneDayRewardReceive.java | 3 +- .../ensoul/RequestItemEnsoul.java | 26 +++++----- .../friend/RequestAnswerFriendInvite.java | 4 +- .../friend/RequestFriendDel.java | 4 +- .../mentoring/ConfirmMenteeAdd.java | 4 +- .../pledgebonus/RequestPledgeBonusReward.java | 3 +- .../primeshop/RequestBRProductList.java | 3 +- .../sayune/RequestFlyMoveStart.java | 5 +- .../shuttle/RequestShuttleGetOn.java | 3 +- .../serverpackets/AbstractHtmlPacket.java | 7 ++- .../serverpackets/ExReplyReceivedPost.java | 3 +- .../serverpackets/ExReplySentPost.java | 3 +- .../serverpackets/ExShowCastleInfo.java | 3 +- .../serverpackets/IClientOutgoingPacket.java | 4 -- .../PledgeReceiveSubPledgeCreated.java | 3 +- .../serverpackets/RecipeItemMakeInfo.java | 4 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SystemMessage.java | 5 +- .../WareHouseWithdrawalList.java | 3 +- .../gameserver/network/PacketLogger.java | 42 ++++++++++++++++ .../network/clientpackets/Action.java | 3 +- .../network/clientpackets/AddTradeItem.java | 5 +- .../clientpackets/CannotMoveAnymore.java | 2 +- .../clientpackets/CharacterCreate.java | 11 +++-- .../clientpackets/CharacterDelete.java | 5 +- .../network/clientpackets/EndScenePlayer.java | 2 +- .../network/clientpackets/EnterWorld.java | 3 +- .../network/clientpackets/ExGetOnAirShip.java | 12 +++-- .../network/clientpackets/GameGuardReply.java | 4 +- .../clientpackets/IClientIncomingPacket.java | 3 -- .../clientpackets/MultiSellChoose.java | 15 +++--- .../clientpackets/RequestAcquireSkill.java | 7 +-- .../RequestAcquireSkillInfo.java | 5 +- .../clientpackets/RequestActionUse.java | 10 ++-- .../network/clientpackets/RequestBlock.java | 3 +- .../network/clientpackets/RequestBuyItem.java | 3 +- .../clientpackets/RequestBypassToServer.java | 10 ++-- .../clientpackets/RequestCrystallizeItem.java | 5 +- .../clientpackets/RequestDestroyItem.java | 4 +- .../clientpackets/RequestDropItem.java | 3 +- .../clientpackets/RequestExChangeName.java | 3 +- .../RequestExCubeGameChangeTeam.java | 3 +- .../RequestExCubeGameReadyAnswer.java | 3 +- .../clientpackets/RequestExFishRanking.java | 3 +- .../RequestExMagicSkillUseGround.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestFortressMapInfo.java | 3 +- .../clientpackets/RequestGetBossRecord.java | 3 +- .../clientpackets/RequestGetItemFromPet.java | 3 +- .../clientpackets/RequestGiveItemToPet.java | 3 +- .../clientpackets/RequestHennaEquip.java | 3 +- .../clientpackets/RequestHennaItemInfo.java | 3 +- .../RequestHennaItemRemoveInfo.java | 4 +- .../clientpackets/RequestHennaRemove.java | 3 +- .../clientpackets/RequestLinkHtml.java | 7 +-- .../clientpackets/RequestMagicSkillList.java | 3 +- .../clientpackets/RequestMagicSkillUse.java | 2 +- .../RequestOustPledgeMember.java | 3 +- .../clientpackets/RequestPCCafeCouponUse.java | 3 +- .../clientpackets/RequestPackageSend.java | 7 +-- .../clientpackets/RequestPetUseItem.java | 3 +- .../RequestPetitionFeedback.java | 3 +- .../RequestPledgeMemberInfo.java | 4 +- .../clientpackets/RequestPreviewItem.java | 6 +-- .../clientpackets/RequestPrivateStoreBuy.java | 3 +- .../RequestPrivateStoreSell.java | 3 +- .../clientpackets/RequestRefundItem.java | 3 +- .../RequestReplySurrenderPledgeWar.java | 3 +- .../clientpackets/RequestRestartPoint.java | 11 +++-- .../clientpackets/RequestSendPost.java | 5 +- .../RequestSetCastleSiegeTime.java | 11 +++-- .../network/clientpackets/Say2.java | 11 +++-- .../SendWareHouseDepositList.java | 7 +-- .../SendWareHouseWithDrawList.java | 5 +- .../network/clientpackets/UseItem.java | 3 +- .../ability/RequestAcquireAbilityList.java | 17 +++---- .../alchemy/RequestAlchemyConversion.java | 5 +- .../alchemy/RequestAlchemyTryMixCube.java | 3 +- .../commission/RequestCommissionRegister.java | 15 +++--- .../RequestCrystallizeEstimate.java | 3 +- .../ensoul/RequestItemEnsoul.java | 26 +++++----- .../friend/RequestAnswerFriendInvite.java | 4 +- .../friend/RequestFriendDel.java | 4 +- .../mentoring/ConfirmMenteeAdd.java | 4 +- .../RequestExPledgeMissionReward.java | 3 +- .../primeshop/RequestBRProductList.java | 3 +- .../sayune/RequestFlyMoveStart.java | 5 +- .../shuttle/RequestShuttleGetOn.java | 3 +- .../serverpackets/AbstractHtmlPacket.java | 7 ++- .../serverpackets/ExReplyReceivedPost.java | 3 +- .../serverpackets/ExReplySentPost.java | 3 +- .../serverpackets/ExShowCastleInfo.java | 3 +- .../serverpackets/IClientOutgoingPacket.java | 4 -- .../PledgeReceiveSubPledgeCreated.java | 3 +- .../serverpackets/RecipeItemMakeInfo.java | 4 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SystemMessage.java | 5 +- .../WareHouseWithdrawalList.java | 3 +- .../gameserver/network/PacketLogger.java | 42 ++++++++++++++++ .../network/clientpackets/Action.java | 3 +- .../network/clientpackets/AddTradeItem.java | 5 +- .../clientpackets/CannotMoveAnymore.java | 2 +- .../clientpackets/CharacterCreate.java | 11 +++-- .../clientpackets/CharacterDelete.java | 5 +- .../network/clientpackets/EndScenePlayer.java | 2 +- .../network/clientpackets/EnterWorld.java | 3 +- .../network/clientpackets/ExGetOnAirShip.java | 12 +++-- .../network/clientpackets/GameGuardReply.java | 4 +- .../clientpackets/IClientIncomingPacket.java | 3 -- .../clientpackets/MultiSellChoose.java | 15 +++--- .../clientpackets/RequestAcquireSkill.java | 7 +-- .../RequestAcquireSkillInfo.java | 5 +- .../clientpackets/RequestActionUse.java | 10 ++-- .../network/clientpackets/RequestBlock.java | 3 +- .../network/clientpackets/RequestBuyItem.java | 3 +- .../clientpackets/RequestBypassToServer.java | 10 ++-- .../clientpackets/RequestCrystallizeItem.java | 5 +- .../clientpackets/RequestDestroyItem.java | 4 +- .../clientpackets/RequestDropItem.java | 3 +- .../clientpackets/RequestExChangeName.java | 3 +- .../RequestExCubeGameChangeTeam.java | 3 +- .../RequestExCubeGameReadyAnswer.java | 3 +- .../clientpackets/RequestExFishRanking.java | 3 +- .../RequestExMagicSkillUseGround.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestFortressMapInfo.java | 3 +- .../clientpackets/RequestGetBossRecord.java | 3 +- .../clientpackets/RequestGetItemFromPet.java | 3 +- .../clientpackets/RequestGiveItemToPet.java | 3 +- .../clientpackets/RequestHennaEquip.java | 3 +- .../clientpackets/RequestHennaItemInfo.java | 3 +- .../RequestHennaItemRemoveInfo.java | 4 +- .../clientpackets/RequestHennaRemove.java | 3 +- .../clientpackets/RequestLinkHtml.java | 7 +-- .../clientpackets/RequestMagicSkillList.java | 3 +- .../clientpackets/RequestMagicSkillUse.java | 2 +- .../RequestOustPledgeMember.java | 3 +- .../clientpackets/RequestPCCafeCouponUse.java | 3 +- .../clientpackets/RequestPackageSend.java | 7 +-- .../clientpackets/RequestPetUseItem.java | 3 +- .../RequestPetitionFeedback.java | 3 +- .../RequestPledgeMemberInfo.java | 4 +- .../clientpackets/RequestPreviewItem.java | 6 +-- .../clientpackets/RequestPrivateStoreBuy.java | 3 +- .../RequestPrivateStoreSell.java | 3 +- .../clientpackets/RequestRefundItem.java | 3 +- .../RequestReplySurrenderPledgeWar.java | 3 +- .../clientpackets/RequestRestartPoint.java | 11 +++-- .../clientpackets/RequestSendPost.java | 5 +- .../RequestSetCastleSiegeTime.java | 11 +++-- .../network/clientpackets/Say2.java | 11 +++-- .../SendWareHouseDepositList.java | 7 +-- .../SendWareHouseWithDrawList.java | 5 +- .../network/clientpackets/UseItem.java | 3 +- .../ability/RequestAcquireAbilityList.java | 17 +++---- .../alchemy/RequestAlchemyConversion.java | 5 +- .../alchemy/RequestAlchemyTryMixCube.java | 3 +- .../commission/RequestCommissionRegister.java | 15 +++--- .../RequestCrystallizeEstimate.java | 3 +- .../ensoul/RequestItemEnsoul.java | 26 +++++----- .../friend/RequestAnswerFriendInvite.java | 4 +- .../friend/RequestFriendDel.java | 4 +- .../mentoring/ConfirmMenteeAdd.java | 4 +- .../RequestExPledgeMissionReward.java | 3 +- .../primeshop/RequestBRProductList.java | 3 +- .../sayune/RequestFlyMoveStart.java | 5 +- .../shuttle/RequestShuttleGetOn.java | 3 +- .../serverpackets/AbstractHtmlPacket.java | 7 ++- .../serverpackets/ExReplyReceivedPost.java | 3 +- .../serverpackets/ExReplySentPost.java | 3 +- .../serverpackets/ExShowCastleInfo.java | 3 +- .../serverpackets/IClientOutgoingPacket.java | 4 -- .../PledgeReceiveSubPledgeCreated.java | 3 +- .../serverpackets/RecipeItemMakeInfo.java | 4 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SystemMessage.java | 5 +- .../WareHouseWithdrawalList.java | 3 +- .../gameserver/network/PacketLogger.java | 42 ++++++++++++++++ .../network/clientpackets/Action.java | 3 +- .../network/clientpackets/AddTradeItem.java | 5 +- .../clientpackets/CannotMoveAnymore.java | 2 +- .../clientpackets/CharacterCreate.java | 11 +++-- .../clientpackets/CharacterDelete.java | 5 +- .../network/clientpackets/EndScenePlayer.java | 2 +- .../network/clientpackets/EnterWorld.java | 3 +- .../network/clientpackets/ExGetOnAirShip.java | 12 +++-- .../network/clientpackets/GameGuardReply.java | 4 +- .../clientpackets/IClientIncomingPacket.java | 3 -- .../clientpackets/MultiSellChoose.java | 15 +++--- .../clientpackets/RequestAcquireSkill.java | 7 +-- .../RequestAcquireSkillInfo.java | 5 +- .../clientpackets/RequestActionUse.java | 10 ++-- .../network/clientpackets/RequestBlock.java | 3 +- .../network/clientpackets/RequestBuyItem.java | 3 +- .../clientpackets/RequestBypassToServer.java | 10 ++-- .../clientpackets/RequestCrystallizeItem.java | 5 +- .../clientpackets/RequestDestroyItem.java | 4 +- .../clientpackets/RequestDropItem.java | 3 +- .../clientpackets/RequestExChangeName.java | 3 +- .../RequestExCubeGameChangeTeam.java | 3 +- .../RequestExCubeGameReadyAnswer.java | 3 +- .../clientpackets/RequestExFishRanking.java | 3 +- .../RequestExMagicSkillUseGround.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestFortressMapInfo.java | 3 +- .../clientpackets/RequestGetBossRecord.java | 3 +- .../clientpackets/RequestGetItemFromPet.java | 3 +- .../clientpackets/RequestGiveItemToPet.java | 3 +- .../clientpackets/RequestHennaEquip.java | 3 +- .../clientpackets/RequestHennaItemInfo.java | 3 +- .../RequestHennaItemRemoveInfo.java | 4 +- .../clientpackets/RequestHennaRemove.java | 3 +- .../clientpackets/RequestLinkHtml.java | 7 +-- .../clientpackets/RequestMagicSkillList.java | 3 +- .../clientpackets/RequestMagicSkillUse.java | 2 +- .../RequestOustPledgeMember.java | 3 +- .../clientpackets/RequestPCCafeCouponUse.java | 3 +- .../clientpackets/RequestPackageSend.java | 7 +-- .../clientpackets/RequestPetUseItem.java | 3 +- .../RequestPetitionFeedback.java | 3 +- .../RequestPledgeMemberInfo.java | 4 +- .../clientpackets/RequestPreviewItem.java | 6 +-- .../clientpackets/RequestPrivateStoreBuy.java | 3 +- .../RequestPrivateStoreSell.java | 3 +- .../clientpackets/RequestRefundItem.java | 3 +- .../RequestReplySurrenderPledgeWar.java | 3 +- .../clientpackets/RequestRestartPoint.java | 11 +++-- .../clientpackets/RequestSendPost.java | 5 +- .../RequestSetCastleSiegeTime.java | 11 +++-- .../network/clientpackets/Say2.java | 11 +++-- .../SendWareHouseDepositList.java | 7 +-- .../SendWareHouseWithDrawList.java | 5 +- .../network/clientpackets/UseItem.java | 3 +- .../ability/RequestAcquireAbilityList.java | 17 +++---- .../alchemy/RequestAlchemyConversion.java | 5 +- .../alchemy/RequestAlchemyTryMixCube.java | 3 +- .../commission/RequestCommissionRegister.java | 15 +++--- .../RequestCrystallizeEstimate.java | 3 +- .../ensoul/RequestItemEnsoul.java | 26 +++++----- .../friend/RequestAnswerFriendInvite.java | 4 +- .../friend/RequestFriendDel.java | 4 +- .../mentoring/ConfirmMenteeAdd.java | 4 +- .../RequestExPledgeMissionReward.java | 3 +- .../primeshop/RequestBRProductList.java | 3 +- .../sayune/RequestFlyMoveStart.java | 5 +- .../shuttle/RequestShuttleGetOn.java | 3 +- .../serverpackets/AbstractHtmlPacket.java | 7 ++- .../serverpackets/ExReplyReceivedPost.java | 3 +- .../serverpackets/ExReplySentPost.java | 3 +- .../serverpackets/ExShowCastleInfo.java | 3 +- .../serverpackets/IClientOutgoingPacket.java | 4 -- .../PledgeReceiveSubPledgeCreated.java | 3 +- .../serverpackets/RecipeItemMakeInfo.java | 4 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SystemMessage.java | 5 +- .../WareHouseWithdrawalList.java | 3 +- .../gameserver/network/PacketLogger.java | 42 ++++++++++++++++ .../network/clientpackets/Action.java | 3 +- .../network/clientpackets/AddTradeItem.java | 5 +- .../clientpackets/CannotMoveAnymore.java | 2 +- .../clientpackets/CharacterCreate.java | 11 +++-- .../clientpackets/CharacterDelete.java | 5 +- .../network/clientpackets/EndScenePlayer.java | 2 +- .../network/clientpackets/EnterWorld.java | 3 +- .../network/clientpackets/ExGetOnAirShip.java | 12 +++-- .../clientpackets/ExRequestTeleport.java | 3 +- .../network/clientpackets/GameGuardReply.java | 4 +- .../clientpackets/IClientIncomingPacket.java | 3 -- .../clientpackets/MultiSellChoose.java | 15 +++--- .../clientpackets/RequestAcquireSkill.java | 7 +-- .../RequestAcquireSkillInfo.java | 5 +- .../clientpackets/RequestActionUse.java | 10 ++-- .../network/clientpackets/RequestAutoUse.java | 48 +++++++++---------- .../network/clientpackets/RequestBlock.java | 3 +- .../network/clientpackets/RequestBuyItem.java | 3 +- .../clientpackets/RequestBypassToServer.java | 10 ++-- .../clientpackets/RequestCrystallizeItem.java | 5 +- .../clientpackets/RequestDestroyItem.java | 4 +- .../clientpackets/RequestDropItem.java | 3 +- .../clientpackets/RequestExChangeName.java | 3 +- .../RequestExCubeGameChangeTeam.java | 3 +- .../RequestExCubeGameReadyAnswer.java | 3 +- .../clientpackets/RequestExFishRanking.java | 3 +- .../RequestExMagicSkillUseGround.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestFortressMapInfo.java | 3 +- .../clientpackets/RequestGetBossRecord.java | 3 +- .../clientpackets/RequestGetItemFromPet.java | 3 +- .../clientpackets/RequestGiveItemToPet.java | 3 +- .../clientpackets/RequestHennaEquip.java | 3 +- .../clientpackets/RequestHennaItemInfo.java | 3 +- .../RequestHennaItemRemoveInfo.java | 4 +- .../clientpackets/RequestHennaRemove.java | 3 +- .../clientpackets/RequestLinkHtml.java | 7 +-- .../clientpackets/RequestMagicSkillList.java | 3 +- .../clientpackets/RequestMagicSkillUse.java | 2 +- .../RequestOustPledgeMember.java | 3 +- .../clientpackets/RequestPCCafeCouponUse.java | 3 +- .../clientpackets/RequestPackageSend.java | 7 +-- .../clientpackets/RequestPetUseItem.java | 3 +- .../RequestPetitionFeedback.java | 3 +- .../RequestPledgeMemberInfo.java | 4 +- .../clientpackets/RequestPreviewItem.java | 6 +-- .../clientpackets/RequestPrivateStoreBuy.java | 3 +- .../RequestPrivateStoreSell.java | 3 +- .../clientpackets/RequestRefundItem.java | 3 +- .../RequestReplySurrenderPledgeWar.java | 3 +- .../clientpackets/RequestRestartPoint.java | 11 +++-- .../clientpackets/RequestSendPost.java | 5 +- .../RequestSetCastleSiegeTime.java | 11 +++-- .../network/clientpackets/Say2.java | 11 +++-- .../SendWareHouseDepositList.java | 7 +-- .../SendWareHouseWithDrawList.java | 5 +- .../network/clientpackets/UseItem.java | 3 +- .../ability/RequestAcquireAbilityList.java | 17 +++---- .../alchemy/RequestAlchemyConversion.java | 5 +- .../alchemy/RequestAlchemyTryMixCube.java | 3 +- .../classchange/ExRequestClassChange.java | 3 +- .../commission/RequestCommissionRegister.java | 15 +++--- .../RequestCrystallizeEstimate.java | 3 +- .../ensoul/RequestItemEnsoul.java | 26 +++++----- .../friend/RequestAnswerFriendInvite.java | 4 +- .../friend/RequestFriendDel.java | 4 +- .../mentoring/ConfirmMenteeAdd.java | 4 +- .../RequestExPledgeMissionReward.java | 3 +- .../primeshop/RequestBRProductList.java | 3 +- .../sayune/RequestFlyMoveStart.java | 5 +- .../shuttle/RequestShuttleGetOn.java | 3 +- .../serverpackets/AbstractHtmlPacket.java | 7 ++- .../serverpackets/ExReplyReceivedPost.java | 3 +- .../serverpackets/ExReplySentPost.java | 3 +- .../serverpackets/ExShowCastleInfo.java | 3 +- .../serverpackets/IClientOutgoingPacket.java | 4 -- .../PledgeReceiveSubPledgeCreated.java | 3 +- .../serverpackets/RecipeItemMakeInfo.java | 4 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SystemMessage.java | 5 +- .../WareHouseWithdrawalList.java | 3 +- .../ranking/ExOlympiadHeroAndLegendInfo.java | 3 +- .../ranking/ExOlympiadMyRankingInfo.java | 5 +- .../gameserver/network/PacketLogger.java | 42 ++++++++++++++++ .../network/clientpackets/Action.java | 3 +- .../network/clientpackets/AddTradeItem.java | 5 +- .../clientpackets/CannotMoveAnymore.java | 2 +- .../clientpackets/CharacterCreate.java | 11 +++-- .../clientpackets/CharacterDelete.java | 5 +- .../network/clientpackets/EndScenePlayer.java | 2 +- .../network/clientpackets/EnterWorld.java | 3 +- .../network/clientpackets/ExGetOnAirShip.java | 12 +++-- .../network/clientpackets/GameGuardReply.java | 4 +- .../clientpackets/IClientIncomingPacket.java | 3 -- .../clientpackets/MultiSellChoose.java | 15 +++--- .../clientpackets/RequestAcquireSkill.java | 7 +-- .../RequestAcquireSkillInfo.java | 5 +- .../clientpackets/RequestActionUse.java | 10 ++-- .../network/clientpackets/RequestAutoUse.java | 48 +++++++++---------- .../network/clientpackets/RequestBlock.java | 3 +- .../network/clientpackets/RequestBuyItem.java | 3 +- .../clientpackets/RequestBypassToServer.java | 10 ++-- .../clientpackets/RequestCrystallizeItem.java | 5 +- .../clientpackets/RequestDestroyItem.java | 4 +- .../clientpackets/RequestDropItem.java | 3 +- .../clientpackets/RequestExChangeName.java | 3 +- .../RequestExCubeGameChangeTeam.java | 3 +- .../RequestExCubeGameReadyAnswer.java | 3 +- .../clientpackets/RequestExFishRanking.java | 3 +- .../RequestExMagicSkillUseGround.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestFortressMapInfo.java | 3 +- .../clientpackets/RequestGetBossRecord.java | 3 +- .../clientpackets/RequestGetItemFromPet.java | 3 +- .../clientpackets/RequestGiveItemToPet.java | 3 +- .../clientpackets/RequestHennaEquip.java | 3 +- .../clientpackets/RequestHennaItemInfo.java | 3 +- .../RequestHennaItemRemoveInfo.java | 4 +- .../clientpackets/RequestHennaRemove.java | 3 +- .../clientpackets/RequestLinkHtml.java | 7 +-- .../clientpackets/RequestMagicSkillList.java | 3 +- .../clientpackets/RequestMagicSkillUse.java | 2 +- .../RequestOustPledgeMember.java | 3 +- .../clientpackets/RequestPCCafeCouponUse.java | 3 +- .../clientpackets/RequestPackageSend.java | 7 +-- .../clientpackets/RequestPetUseItem.java | 3 +- .../RequestPetitionFeedback.java | 3 +- .../RequestPledgeMemberInfo.java | 4 +- .../clientpackets/RequestPreviewItem.java | 6 +-- .../clientpackets/RequestPrivateStoreBuy.java | 3 +- .../RequestPrivateStoreSell.java | 3 +- .../clientpackets/RequestRefundItem.java | 3 +- .../RequestReplySurrenderPledgeWar.java | 3 +- .../clientpackets/RequestRestartPoint.java | 11 +++-- .../clientpackets/RequestSendPost.java | 5 +- .../RequestSetCastleSiegeTime.java | 11 +++-- .../network/clientpackets/Say2.java | 11 +++-- .../SendWareHouseDepositList.java | 7 +-- .../SendWareHouseWithDrawList.java | 5 +- .../network/clientpackets/UseItem.java | 3 +- .../ability/RequestAcquireAbilityList.java | 17 +++---- .../alchemy/RequestAlchemyConversion.java | 5 +- .../alchemy/RequestAlchemyTryMixCube.java | 3 +- .../classchange/ExRequestClassChange.java | 3 +- .../commission/RequestCommissionRegister.java | 15 +++--- .../RequestCrystallizeEstimate.java | 3 +- .../ensoul/RequestItemEnsoul.java | 26 +++++----- .../friend/RequestAnswerFriendInvite.java | 4 +- .../friend/RequestFriendDel.java | 4 +- .../homunculus/RequestExHomunculusSummon.java | 3 +- .../mentoring/ConfirmMenteeAdd.java | 4 +- .../RequestExPledgeMissionReward.java | 3 +- .../primeshop/RequestBRProductList.java | 3 +- .../RequestRaidBossSpawnInfo.java | 2 +- .../sayune/RequestFlyMoveStart.java | 5 +- .../shuttle/RequestShuttleGetOn.java | 3 +- .../teleports/ExRequestTeleport.java | 3 +- .../ExRequestTeleportFavoritesAddDel.java | 5 +- .../serverpackets/AbstractHtmlPacket.java | 7 ++- .../serverpackets/ExReplyReceivedPost.java | 3 +- .../serverpackets/ExReplySentPost.java | 3 +- .../serverpackets/ExShowCastleInfo.java | 3 +- .../serverpackets/IClientOutgoingPacket.java | 4 -- .../PledgeReceiveSubPledgeCreated.java | 3 +- .../serverpackets/RecipeItemMakeInfo.java | 4 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SystemMessage.java | 5 +- .../WareHouseWithdrawalList.java | 3 +- .../ranking/ExOlympiadHeroAndLegendInfo.java | 3 +- .../ranking/ExOlympiadMyRankingInfo.java | 5 +- .../gameserver/network/PacketLogger.java | 42 ++++++++++++++++ .../network/clientpackets/Action.java | 3 +- .../network/clientpackets/AddTradeItem.java | 5 +- .../clientpackets/CannotMoveAnymore.java | 2 +- .../clientpackets/CharacterCreate.java | 11 +++-- .../clientpackets/CharacterDelete.java | 5 +- .../network/clientpackets/EndScenePlayer.java | 2 +- .../network/clientpackets/EnterWorld.java | 3 +- .../network/clientpackets/ExGetOnAirShip.java | 12 +++-- .../network/clientpackets/ExOpenHtml.java | 3 +- .../network/clientpackets/GameGuardReply.java | 4 +- .../clientpackets/IClientIncomingPacket.java | 3 -- .../clientpackets/MultiSellChoose.java | 15 +++--- .../clientpackets/RequestAcquireSkill.java | 7 +-- .../RequestAcquireSkillInfo.java | 5 +- .../clientpackets/RequestActionUse.java | 10 ++-- .../network/clientpackets/RequestAutoUse.java | 48 +++++++++---------- .../network/clientpackets/RequestBlock.java | 3 +- .../network/clientpackets/RequestBuyItem.java | 3 +- .../clientpackets/RequestBypassToServer.java | 10 ++-- .../clientpackets/RequestCrystallizeItem.java | 5 +- .../clientpackets/RequestDestroyItem.java | 4 +- .../clientpackets/RequestDropItem.java | 3 +- .../clientpackets/RequestExChangeName.java | 3 +- .../RequestExCubeGameChangeTeam.java | 3 +- .../RequestExCubeGameReadyAnswer.java | 3 +- .../clientpackets/RequestExFishRanking.java | 3 +- .../RequestExMagicSkillUseGround.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestFortressMapInfo.java | 3 +- .../clientpackets/RequestGetBossRecord.java | 3 +- .../clientpackets/RequestGetItemFromPet.java | 3 +- .../clientpackets/RequestGiveItemToPet.java | 3 +- .../clientpackets/RequestHennaEquip.java | 3 +- .../clientpackets/RequestHennaItemInfo.java | 3 +- .../RequestHennaItemRemoveInfo.java | 4 +- .../clientpackets/RequestHennaRemove.java | 3 +- .../clientpackets/RequestLinkHtml.java | 7 +-- .../clientpackets/RequestMagicSkillList.java | 3 +- .../clientpackets/RequestMagicSkillUse.java | 2 +- .../RequestOustPledgeMember.java | 3 +- .../clientpackets/RequestPCCafeCouponUse.java | 3 +- .../clientpackets/RequestPackageSend.java | 7 +-- .../clientpackets/RequestPetUseItem.java | 3 +- .../RequestPetitionFeedback.java | 3 +- .../RequestPledgeMemberInfo.java | 4 +- .../clientpackets/RequestPreviewItem.java | 6 +-- .../clientpackets/RequestPrivateStoreBuy.java | 3 +- .../RequestPrivateStoreSell.java | 3 +- .../clientpackets/RequestRefundItem.java | 3 +- .../RequestReplySurrenderPledgeWar.java | 3 +- .../clientpackets/RequestRestartPoint.java | 11 +++-- .../clientpackets/RequestSendPost.java | 5 +- .../RequestSetCastleSiegeTime.java | 11 +++-- .../network/clientpackets/Say2.java | 11 +++-- .../SendWareHouseDepositList.java | 7 +-- .../SendWareHouseWithDrawList.java | 5 +- .../network/clientpackets/UseItem.java | 3 +- .../ability/RequestAcquireAbilityList.java | 17 +++---- .../alchemy/RequestAlchemyConversion.java | 5 +- .../alchemy/RequestAlchemyTryMixCube.java | 3 +- .../classchange/ExRequestClassChange.java | 3 +- .../commission/RequestCommissionRegister.java | 15 +++--- .../RequestCrystallizeEstimate.java | 3 +- .../ensoul/RequestItemEnsoul.java | 26 +++++----- .../friend/RequestAnswerFriendInvite.java | 4 +- .../friend/RequestFriendDel.java | 4 +- .../homunculus/RequestExHomunculusSummon.java | 3 +- ...RequestExSummonHomunculusCouponResult.java | 3 +- .../mentoring/ConfirmMenteeAdd.java | 4 +- .../RequestExPledgeMissionReward.java | 3 +- .../primeshop/RequestBRProductList.java | 3 +- .../RequestRaidBossSpawnInfo.java | 2 +- .../sayune/RequestFlyMoveStart.java | 5 +- .../shuttle/RequestShuttleGetOn.java | 3 +- .../teleports/ExRequestTeleport.java | 3 +- .../ExRequestTeleportFavoritesAddDel.java | 5 +- .../serverpackets/AbstractHtmlPacket.java | 7 ++- .../serverpackets/ExReplyReceivedPost.java | 3 +- .../serverpackets/ExReplySentPost.java | 3 +- .../serverpackets/ExShowCastleInfo.java | 3 +- .../serverpackets/IClientOutgoingPacket.java | 4 -- .../PledgeReceiveSubPledgeCreated.java | 3 +- .../serverpackets/RecipeItemMakeInfo.java | 4 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SystemMessage.java | 5 +- .../WareHouseWithdrawalList.java | 3 +- .../ranking/ExOlympiadHeroAndLegendInfo.java | 3 +- .../ranking/ExOlympiadMyRankingInfo.java | 5 +- .../gameserver/network/PacketLogger.java | 42 ++++++++++++++++ .../network/clientpackets/Action.java | 3 +- .../network/clientpackets/AddTradeItem.java | 5 +- .../clientpackets/CannotMoveAnymore.java | 2 +- .../clientpackets/CharacterCreate.java | 11 +++-- .../clientpackets/CharacterDelete.java | 5 +- .../network/clientpackets/EndScenePlayer.java | 2 +- .../network/clientpackets/EnterWorld.java | 3 +- .../network/clientpackets/ExGetOnAirShip.java | 12 +++-- .../network/clientpackets/ExOpenHtml.java | 3 +- .../network/clientpackets/GameGuardReply.java | 4 +- .../clientpackets/IClientIncomingPacket.java | 3 -- .../clientpackets/MultiSellChoose.java | 15 +++--- .../clientpackets/RequestAcquireSkill.java | 7 +-- .../RequestAcquireSkillInfo.java | 5 +- .../clientpackets/RequestActionUse.java | 10 ++-- .../network/clientpackets/RequestAutoUse.java | 48 +++++++++---------- .../network/clientpackets/RequestBlock.java | 3 +- .../network/clientpackets/RequestBuyItem.java | 3 +- .../clientpackets/RequestBypassToServer.java | 10 ++-- .../clientpackets/RequestCrystallizeItem.java | 5 +- .../clientpackets/RequestDestroyItem.java | 4 +- .../clientpackets/RequestDropItem.java | 3 +- .../clientpackets/RequestExChangeName.java | 3 +- .../RequestExCubeGameChangeTeam.java | 3 +- .../RequestExCubeGameReadyAnswer.java | 3 +- .../clientpackets/RequestExFishRanking.java | 3 +- .../RequestExMagicSkillUseGround.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestFortressMapInfo.java | 3 +- .../clientpackets/RequestGetBossRecord.java | 3 +- .../clientpackets/RequestGetItemFromPet.java | 3 +- .../clientpackets/RequestGiveItemToPet.java | 3 +- .../clientpackets/RequestHennaEquip.java | 3 +- .../clientpackets/RequestHennaItemInfo.java | 3 +- .../RequestHennaItemRemoveInfo.java | 4 +- .../clientpackets/RequestHennaRemove.java | 3 +- .../clientpackets/RequestLinkHtml.java | 7 +-- .../clientpackets/RequestMagicSkillList.java | 3 +- .../clientpackets/RequestMagicSkillUse.java | 2 +- .../RequestOustPledgeMember.java | 3 +- .../clientpackets/RequestPCCafeCouponUse.java | 3 +- .../clientpackets/RequestPackageSend.java | 7 +-- .../clientpackets/RequestPetUseItem.java | 3 +- .../RequestPetitionFeedback.java | 3 +- .../RequestPledgeMemberInfo.java | 4 +- .../clientpackets/RequestPreviewItem.java | 6 +-- .../clientpackets/RequestPrivateStoreBuy.java | 3 +- .../RequestPrivateStoreSell.java | 3 +- .../clientpackets/RequestRefundItem.java | 3 +- .../RequestReplySurrenderPledgeWar.java | 3 +- .../clientpackets/RequestRestartPoint.java | 11 +++-- .../clientpackets/RequestSendPost.java | 5 +- .../RequestSetCastleSiegeTime.java | 11 +++-- .../network/clientpackets/Say2.java | 11 +++-- .../SendWareHouseDepositList.java | 7 +-- .../SendWareHouseWithDrawList.java | 5 +- .../network/clientpackets/UseItem.java | 3 +- .../ability/RequestAcquireAbilityList.java | 17 +++---- .../alchemy/RequestAlchemyConversion.java | 5 +- .../alchemy/RequestAlchemyTryMixCube.java | 3 +- .../classchange/ExRequestClassChange.java | 3 +- .../commission/RequestCommissionRegister.java | 15 +++--- .../RequestCrystallizeEstimate.java | 3 +- .../ensoul/RequestItemEnsoul.java | 26 +++++----- .../friend/RequestAnswerFriendInvite.java | 4 +- .../friend/RequestFriendDel.java | 4 +- .../homunculus/RequestExHomunculusSummon.java | 3 +- ...RequestExSummonHomunculusCouponResult.java | 3 +- .../mentoring/ConfirmMenteeAdd.java | 4 +- .../RequestExPledgeMissionReward.java | 3 +- .../primeshop/RequestBRProductList.java | 3 +- .../RequestRaidBossSpawnInfo.java | 2 +- .../sayune/RequestFlyMoveStart.java | 5 +- .../shuttle/RequestShuttleGetOn.java | 3 +- .../teleports/ExRequestTeleport.java | 3 +- .../ExRequestTeleportFavoritesAddDel.java | 5 +- .../serverpackets/AbstractHtmlPacket.java | 7 ++- .../serverpackets/ExReplyReceivedPost.java | 3 +- .../serverpackets/ExReplySentPost.java | 3 +- .../serverpackets/ExShowCastleInfo.java | 3 +- .../serverpackets/IClientOutgoingPacket.java | 4 -- .../PledgeReceiveSubPledgeCreated.java | 3 +- .../serverpackets/RecipeItemMakeInfo.java | 4 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SystemMessage.java | 5 +- .../WareHouseWithdrawalList.java | 3 +- .../ranking/ExOlympiadHeroAndLegendInfo.java | 3 +- .../ranking/ExOlympiadMyRankingInfo.java | 5 +- .../gameserver/network/PacketLogger.java | 42 ++++++++++++++++ .../network/clientpackets/Action.java | 3 +- .../network/clientpackets/AddTradeItem.java | 7 +-- .../clientpackets/CharacterCreate.java | 3 +- .../clientpackets/CharacterDelete.java | 5 +- .../clientpackets/CharacterSelected.java | 5 +- .../network/clientpackets/EnterWorld.java | 13 ++--- .../clientpackets/IClientIncomingPacket.java | 3 -- .../clientpackets/MultiSellChoose.java | 5 +- .../clientpackets/ProtocolVersion.java | 5 +- .../clientpackets/RequestActionUse.java | 9 ++-- .../RequestAnswerFriendInvite.java | 3 +- .../clientpackets/RequestAquireSkill.java | 3 +- .../network/clientpackets/RequestBlock.java | 3 +- .../network/clientpackets/RequestBuyItem.java | 3 +- .../clientpackets/RequestBypassToServer.java | 5 +- .../clientpackets/RequestCrystallizeItem.java | 5 +- .../clientpackets/RequestDestroyItem.java | 3 +- .../clientpackets/RequestDropItem.java | 3 +- .../clientpackets/RequestFriendDel.java | 3 +- .../clientpackets/RequestGetItemFromPet.java | 3 +- .../clientpackets/RequestGiveItemToPet.java | 3 +- .../clientpackets/RequestLinkHtml.java | 3 +- .../clientpackets/RequestMagicSkillUse.java | 3 +- .../RequestOustPledgeMember.java | 3 +- .../clientpackets/RequestPCCafeCouponUse.java | 3 +- .../clientpackets/RequestPackageSend.java | 7 +-- .../clientpackets/RequestPartyMatchList.java | 4 +- .../clientpackets/RequestPetUseItem.java | 3 +- .../RequestPledgeMemberInfo.java | 4 +- .../clientpackets/RequestPrivateStoreBuy.java | 7 +-- .../RequestPrivateStoreManageBuy.java | 3 +- .../RequestPrivateStoreManageSell.java | 3 +- .../RequestPrivateStoreSell.java | 3 +- .../network/clientpackets/RequestRestart.java | 3 +- .../clientpackets/RequestRestartPoint.java | 5 +- .../RequestSurrenderPersonally.java | 3 +- .../RequestSurrenderPledgeWar.java | 3 +- .../clientpackets/RequestWearItem.java | 5 +- .../network/clientpackets/Say2.java | 5 +- .../clientpackets/SendBypassBuildCmd.java | 5 +- .../SendWareHouseDepositList.java | 7 +-- .../SendWareHouseWithDrawList.java | 3 +- .../network/serverpackets/CharSelectInfo.java | 5 +- .../serverpackets/IClientOutgoingPacket.java | 4 -- .../network/serverpackets/NpcHtmlMessage.java | 7 +-- .../network/serverpackets/SiegeInfo.java | 3 +- .../WareHouseWithdrawalList.java | 3 +- .../gameserver/network/PacketLogger.java | 42 ++++++++++++++++ .../network/clientpackets/Action.java | 3 +- .../network/clientpackets/AddTradeItem.java | 7 +-- .../clientpackets/CharacterCreate.java | 3 +- .../clientpackets/CharacterDelete.java | 5 +- .../clientpackets/CharacterSelected.java | 5 +- .../network/clientpackets/EnterWorld.java | 13 ++--- .../clientpackets/IClientIncomingPacket.java | 3 -- .../clientpackets/MultiSellChoose.java | 5 +- .../clientpackets/ProtocolVersion.java | 5 +- .../clientpackets/RequestActionUse.java | 9 ++-- .../RequestAnswerFriendInvite.java | 3 +- .../clientpackets/RequestAquireSkill.java | 3 +- .../network/clientpackets/RequestBlock.java | 3 +- .../network/clientpackets/RequestBuyItem.java | 3 +- .../clientpackets/RequestBypassToServer.java | 5 +- .../clientpackets/RequestCrystallizeItem.java | 5 +- .../clientpackets/RequestDestroyItem.java | 3 +- .../clientpackets/RequestDropItem.java | 3 +- .../clientpackets/RequestFriendDel.java | 3 +- .../clientpackets/RequestGetItemFromPet.java | 3 +- .../clientpackets/RequestGiveItemToPet.java | 3 +- .../clientpackets/RequestLinkHtml.java | 3 +- .../clientpackets/RequestMagicSkillUse.java | 3 +- .../RequestOustPledgeMember.java | 3 +- .../clientpackets/RequestPCCafeCouponUse.java | 3 +- .../clientpackets/RequestPackageSend.java | 9 ++-- .../clientpackets/RequestPartyMatchList.java | 4 +- .../clientpackets/RequestPetUseItem.java | 3 +- .../RequestPledgeMemberInfo.java | 4 +- .../clientpackets/RequestPrivateStoreBuy.java | 7 +-- .../RequestPrivateStoreManageBuy.java | 3 +- .../RequestPrivateStoreManageSell.java | 3 +- .../RequestPrivateStoreSell.java | 3 +- .../network/clientpackets/RequestRestart.java | 3 +- .../clientpackets/RequestRestartPoint.java | 5 +- .../RequestSurrenderPersonally.java | 3 +- .../RequestSurrenderPledgeWar.java | 3 +- .../clientpackets/RequestWearItem.java | 5 +- .../network/clientpackets/Say2.java | 5 +- .../clientpackets/SendBypassBuildCmd.java | 5 +- .../SendWareHouseDepositList.java | 9 ++-- .../SendWareHouseWithDrawList.java | 3 +- .../network/serverpackets/CharSelectInfo.java | 7 +-- .../serverpackets/IClientOutgoingPacket.java | 4 -- .../network/serverpackets/NpcHtmlMessage.java | 7 +-- .../network/serverpackets/SiegeInfo.java | 3 +- .../WareHouseWithdrawalList.java | 3 +- .../gameserver/network/PacketLogger.java | 42 ++++++++++++++++ .../network/clientpackets/Action.java | 3 +- .../network/clientpackets/AddTradeItem.java | 5 +- .../clientpackets/CharacterCreate.java | 9 ++-- .../clientpackets/CharacterDelete.java | 5 +- .../network/clientpackets/EnterWorld.java | 3 +- .../network/clientpackets/ExGetOnAirShip.java | 12 +++-- .../network/clientpackets/GameGuardReply.java | 4 +- .../clientpackets/IClientIncomingPacket.java | 3 -- .../clientpackets/MultiSellChoose.java | 5 +- .../clientpackets/RequestAcquireSkill.java | 13 ++--- .../RequestAcquireSkillInfo.java | 5 +- .../clientpackets/RequestActionUse.java | 3 +- .../RequestAnswerFriendInvite.java | 4 +- .../network/clientpackets/RequestBlock.java | 3 +- .../clientpackets/RequestBrBuyProduct.java | 4 +- .../network/clientpackets/RequestBuyItem.java | 3 +- .../clientpackets/RequestBypassToServer.java | 10 ++-- .../clientpackets/RequestCrystallizeItem.java | 7 +-- .../clientpackets/RequestDestroyItem.java | 4 +- .../clientpackets/RequestDropItem.java | 3 +- .../clientpackets/RequestExChangeName.java | 3 +- .../RequestExCubeGameChangeTeam.java | 3 +- .../RequestExCubeGameReadyAnswer.java | 3 +- .../RequestExMagicSkillUseGround.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 5 +- .../clientpackets/RequestFortressMapInfo.java | 3 +- .../clientpackets/RequestFriendDel.java | 4 +- .../clientpackets/RequestGetBossRecord.java | 3 +- .../clientpackets/RequestGetItemFromPet.java | 3 +- .../clientpackets/RequestGiveItemToPet.java | 3 +- .../clientpackets/RequestHennaEquip.java | 3 +- .../clientpackets/RequestHennaItemInfo.java | 3 +- .../RequestHennaItemRemoveInfo.java | 3 +- .../clientpackets/RequestHennaRemove.java | 3 +- .../clientpackets/RequestLinkHtml.java | 7 +-- .../RequestOustPledgeMember.java | 3 +- .../clientpackets/RequestPCCafeCouponUse.java | 3 +- .../clientpackets/RequestPackageSend.java | 9 ++-- .../clientpackets/RequestPartyMatchList.java | 4 +- .../clientpackets/RequestPetUseItem.java | 3 +- .../RequestPetitionFeedback.java | 4 +- .../RequestPledgeMemberInfo.java | 4 +- .../clientpackets/RequestPreviewItem.java | 6 +-- .../clientpackets/RequestPrivateStoreBuy.java | 3 +- .../RequestPrivateStoreSell.java | 3 +- .../clientpackets/RequestRefundItem.java | 3 +- .../RequestReplySurrenderPledgeWar.java | 3 +- .../network/clientpackets/RequestRestart.java | 3 +- .../clientpackets/RequestRestartPoint.java | 11 +++-- .../clientpackets/RequestSendPost.java | 5 +- .../RequestSetCastleSiegeTime.java | 12 ++--- .../RequestSurrenderPledgeWar.java | 3 +- .../network/clientpackets/Say2.java | 11 +++-- .../SendWareHouseDepositList.java | 7 +-- .../SendWareHouseWithDrawList.java | 5 +- .../network/clientpackets/UseItem.java | 4 +- .../serverpackets/AbstractHtmlPacket.java | 7 ++- .../serverpackets/ExBrRecentProductList.java | 4 +- .../serverpackets/ExReplyReceivedPost.java | 3 +- .../serverpackets/ExReplySentPost.java | 3 +- .../serverpackets/ExShowCastleInfo.java | 3 +- .../serverpackets/IClientOutgoingPacket.java | 4 -- .../PledgeReceiveSubPledgeCreated.java | 3 +- .../serverpackets/RecipeItemMakeInfo.java | 3 +- .../network/serverpackets/SiegeInfo.java | 5 +- .../SortedWareHouseWithdrawalList.java | 3 +- .../network/serverpackets/SystemMessage.java | 6 +-- .../WareHouseWithdrawalList.java | 3 +- .../gameserver/network/PacketLogger.java | 42 ++++++++++++++++ .../network/clientpackets/Action.java | 3 +- .../network/clientpackets/AddTradeItem.java | 5 +- .../clientpackets/CharacterCreate.java | 9 ++-- .../clientpackets/CharacterDelete.java | 5 +- .../network/clientpackets/EnterWorld.java | 3 +- .../network/clientpackets/ExGetOnAirShip.java | 12 +++-- .../network/clientpackets/GameGuardReply.java | 4 +- .../clientpackets/IClientIncomingPacket.java | 3 -- .../clientpackets/MultiSellChoose.java | 5 +- .../clientpackets/RequestAcquireSkill.java | 13 ++--- .../RequestAcquireSkillInfo.java | 5 +- .../clientpackets/RequestActionUse.java | 3 +- .../RequestAnswerFriendInvite.java | 4 +- .../network/clientpackets/RequestBlock.java | 3 +- .../clientpackets/RequestBrBuyProduct.java | 4 +- .../network/clientpackets/RequestBuyItem.java | 3 +- .../clientpackets/RequestBypassToServer.java | 10 ++-- .../clientpackets/RequestCrystallizeItem.java | 7 +-- .../clientpackets/RequestDestroyItem.java | 4 +- .../clientpackets/RequestDropItem.java | 3 +- .../clientpackets/RequestExChangeName.java | 3 +- .../RequestExCubeGameChangeTeam.java | 3 +- .../RequestExCubeGameReadyAnswer.java | 3 +- .../RequestExMagicSkillUseGround.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 5 +- .../clientpackets/RequestFortressMapInfo.java | 3 +- .../clientpackets/RequestFriendDel.java | 4 +- .../clientpackets/RequestGetBossRecord.java | 3 +- .../clientpackets/RequestGetItemFromPet.java | 3 +- .../clientpackets/RequestGiveItemToPet.java | 3 +- .../clientpackets/RequestHennaEquip.java | 3 +- .../clientpackets/RequestHennaItemInfo.java | 3 +- .../RequestHennaItemRemoveInfo.java | 3 +- .../clientpackets/RequestHennaRemove.java | 3 +- .../clientpackets/RequestLinkHtml.java | 7 +-- .../RequestOustPledgeMember.java | 3 +- .../clientpackets/RequestPCCafeCouponUse.java | 3 +- .../clientpackets/RequestPackageSend.java | 9 ++-- .../clientpackets/RequestPartyMatchList.java | 4 +- .../clientpackets/RequestPetUseItem.java | 3 +- .../RequestPetitionFeedback.java | 4 +- .../RequestPledgeMemberInfo.java | 4 +- .../clientpackets/RequestPreviewItem.java | 6 +-- .../clientpackets/RequestPrivateStoreBuy.java | 3 +- .../RequestPrivateStoreSell.java | 3 +- .../clientpackets/RequestRefundItem.java | 3 +- .../RequestReplySurrenderPledgeWar.java | 3 +- .../network/clientpackets/RequestRestart.java | 3 +- .../clientpackets/RequestRestartPoint.java | 11 +++-- .../clientpackets/RequestSendPost.java | 5 +- .../RequestSetCastleSiegeTime.java | 12 ++--- .../RequestSurrenderPledgeWar.java | 3 +- .../network/clientpackets/Say2.java | 11 +++-- .../SendWareHouseDepositList.java | 7 +-- .../SendWareHouseWithDrawList.java | 5 +- .../network/clientpackets/UseItem.java | 4 +- .../serverpackets/AbstractHtmlPacket.java | 7 ++- .../serverpackets/ExBrRecentProductList.java | 4 +- .../serverpackets/ExReplyReceivedPost.java | 3 +- .../serverpackets/ExReplySentPost.java | 3 +- .../serverpackets/ExShowCastleInfo.java | 3 +- .../serverpackets/IClientOutgoingPacket.java | 4 -- .../PledgeReceiveSubPledgeCreated.java | 3 +- .../serverpackets/RecipeItemMakeInfo.java | 3 +- .../network/serverpackets/SiegeInfo.java | 5 +- .../SortedWareHouseWithdrawalList.java | 3 +- .../network/serverpackets/SystemMessage.java | 6 +-- .../WareHouseWithdrawalList.java | 3 +- .../gameserver/network/PacketLogger.java | 42 ++++++++++++++++ .../network/clientpackets/Action.java | 3 +- .../network/clientpackets/AddTradeItem.java | 5 +- .../clientpackets/CannotMoveAnymore.java | 2 +- .../clientpackets/CharacterCreate.java | 9 ++-- .../clientpackets/CharacterDelete.java | 5 +- .../network/clientpackets/EndScenePlayer.java | 2 +- .../network/clientpackets/EnterWorld.java | 3 +- .../network/clientpackets/ExGetOnAirShip.java | 12 +++-- .../network/clientpackets/GameGuardReply.java | 4 +- .../clientpackets/IClientIncomingPacket.java | 3 -- .../clientpackets/MultiSellChoose.java | 15 +++--- .../clientpackets/RequestAcquireSkill.java | 7 +-- .../RequestAcquireSkillInfo.java | 5 +- .../clientpackets/RequestActionUse.java | 10 ++-- .../network/clientpackets/RequestBlock.java | 3 +- .../network/clientpackets/RequestBuyItem.java | 3 +- .../clientpackets/RequestBypassToServer.java | 10 ++-- .../clientpackets/RequestCrystallizeItem.java | 5 +- .../clientpackets/RequestDestroyItem.java | 4 +- .../clientpackets/RequestDropItem.java | 3 +- .../clientpackets/RequestExChangeName.java | 3 +- .../RequestExCubeGameChangeTeam.java | 3 +- .../RequestExCubeGameReadyAnswer.java | 3 +- .../clientpackets/RequestExFishRanking.java | 3 +- .../RequestExMagicSkillUseGround.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestFortressMapInfo.java | 3 +- .../clientpackets/RequestGetBossRecord.java | 3 +- .../clientpackets/RequestGetItemFromPet.java | 3 +- .../clientpackets/RequestGiveItemToPet.java | 3 +- .../clientpackets/RequestHennaEquip.java | 3 +- .../clientpackets/RequestHennaItemInfo.java | 3 +- .../RequestHennaItemRemoveInfo.java | 4 +- .../clientpackets/RequestHennaRemove.java | 3 +- .../clientpackets/RequestLinkHtml.java | 7 +-- .../clientpackets/RequestMagicSkillList.java | 3 +- .../clientpackets/RequestMagicSkillUse.java | 2 +- .../RequestOustPledgeMember.java | 3 +- .../clientpackets/RequestPCCafeCouponUse.java | 3 +- .../clientpackets/RequestPackageSend.java | 7 +-- .../clientpackets/RequestPetUseItem.java | 3 +- .../RequestPetitionFeedback.java | 3 +- .../RequestPledgeMemberInfo.java | 4 +- .../clientpackets/RequestPreviewItem.java | 6 +-- .../clientpackets/RequestPrivateStoreBuy.java | 3 +- .../RequestPrivateStoreSell.java | 3 +- .../clientpackets/RequestRefundItem.java | 3 +- .../RequestReplySurrenderPledgeWar.java | 3 +- .../clientpackets/RequestRestartPoint.java | 11 +++-- .../clientpackets/RequestSendPost.java | 5 +- .../RequestSetCastleSiegeTime.java | 11 +++-- .../network/clientpackets/Say2.java | 11 +++-- .../SendWareHouseDepositList.java | 7 +-- .../SendWareHouseWithDrawList.java | 5 +- .../network/clientpackets/UseItem.java | 3 +- .../commission/RequestCommissionRegister.java | 15 +++--- .../RequestCrystallizeEstimate.java | 3 +- .../RequestOneDayRewardReceive.java | 3 +- .../friend/RequestAnswerFriendInvite.java | 4 +- .../friend/RequestFriendDel.java | 4 +- .../mentoring/ConfirmMenteeAdd.java | 4 +- .../pledgebonus/RequestPledgeBonusReward.java | 3 +- .../primeshop/RequestBRProductList.java | 3 +- .../sayune/RequestFlyMoveStart.java | 5 +- .../shuttle/RequestShuttleGetOn.java | 3 +- .../serverpackets/AbstractHtmlPacket.java | 7 ++- .../serverpackets/ExReplyReceivedPost.java | 3 +- .../serverpackets/ExReplySentPost.java | 3 +- .../serverpackets/ExShowCastleInfo.java | 3 +- .../serverpackets/IClientOutgoingPacket.java | 4 -- .../PledgeReceiveSubPledgeCreated.java | 3 +- .../serverpackets/RecipeItemMakeInfo.java | 4 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SystemMessage.java | 5 +- .../WareHouseWithdrawalList.java | 3 +- .../gameserver/network/PacketLogger.java | 42 ++++++++++++++++ .../network/clientpackets/Action.java | 3 +- .../network/clientpackets/AddTradeItem.java | 5 +- .../clientpackets/CannotMoveAnymore.java | 2 +- .../clientpackets/CharacterCreate.java | 9 ++-- .../clientpackets/CharacterDelete.java | 5 +- .../network/clientpackets/EndScenePlayer.java | 2 +- .../network/clientpackets/EnterWorld.java | 3 +- .../network/clientpackets/ExGetOnAirShip.java | 12 +++-- .../network/clientpackets/GameGuardReply.java | 4 +- .../clientpackets/IClientIncomingPacket.java | 3 -- .../clientpackets/MultiSellChoose.java | 15 +++--- .../clientpackets/RequestAcquireSkill.java | 7 +-- .../RequestAcquireSkillInfo.java | 5 +- .../clientpackets/RequestActionUse.java | 10 ++-- .../network/clientpackets/RequestBlock.java | 3 +- .../network/clientpackets/RequestBuyItem.java | 3 +- .../clientpackets/RequestBypassToServer.java | 10 ++-- .../clientpackets/RequestCrystallizeItem.java | 5 +- .../clientpackets/RequestDestroyItem.java | 4 +- .../clientpackets/RequestDropItem.java | 3 +- .../clientpackets/RequestExChangeName.java | 3 +- .../RequestExCubeGameChangeTeam.java | 3 +- .../RequestExCubeGameReadyAnswer.java | 3 +- .../clientpackets/RequestExFishRanking.java | 3 +- .../RequestExMagicSkillUseGround.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestFortressMapInfo.java | 3 +- .../clientpackets/RequestGetBossRecord.java | 3 +- .../clientpackets/RequestGetItemFromPet.java | 3 +- .../clientpackets/RequestGiveItemToPet.java | 3 +- .../clientpackets/RequestHennaEquip.java | 3 +- .../clientpackets/RequestHennaItemInfo.java | 3 +- .../RequestHennaItemRemoveInfo.java | 4 +- .../clientpackets/RequestHennaRemove.java | 3 +- .../clientpackets/RequestLinkHtml.java | 7 +-- .../clientpackets/RequestMagicSkillList.java | 3 +- .../clientpackets/RequestMagicSkillUse.java | 2 +- .../RequestOustPledgeMember.java | 3 +- .../clientpackets/RequestPCCafeCouponUse.java | 3 +- .../clientpackets/RequestPackageSend.java | 7 +-- .../clientpackets/RequestPetUseItem.java | 3 +- .../RequestPetitionFeedback.java | 3 +- .../RequestPledgeMemberInfo.java | 4 +- .../clientpackets/RequestPreviewItem.java | 6 +-- .../clientpackets/RequestPrivateStoreBuy.java | 3 +- .../RequestPrivateStoreSell.java | 3 +- .../clientpackets/RequestRefundItem.java | 3 +- .../RequestReplySurrenderPledgeWar.java | 3 +- .../clientpackets/RequestRestartPoint.java | 11 +++-- .../clientpackets/RequestSendPost.java | 5 +- .../RequestSetCastleSiegeTime.java | 11 +++-- .../network/clientpackets/Say2.java | 11 +++-- .../SendWareHouseDepositList.java | 7 +-- .../SendWareHouseWithDrawList.java | 5 +- .../network/clientpackets/UseItem.java | 3 +- .../commission/RequestCommissionRegister.java | 15 +++--- .../RequestCrystallizeEstimate.java | 3 +- .../RequestOneDayRewardReceive.java | 3 +- .../friend/RequestAnswerFriendInvite.java | 4 +- .../friend/RequestFriendDel.java | 4 +- .../mentoring/ConfirmMenteeAdd.java | 4 +- .../pledgebonus/RequestPledgeBonusReward.java | 3 +- .../primeshop/RequestBRProductList.java | 3 +- .../sayune/RequestFlyMoveStart.java | 5 +- .../shuttle/RequestShuttleGetOn.java | 3 +- .../serverpackets/AbstractHtmlPacket.java | 7 ++- .../serverpackets/ExReplyReceivedPost.java | 3 +- .../serverpackets/ExReplySentPost.java | 3 +- .../serverpackets/ExShowCastleInfo.java | 3 +- .../serverpackets/IClientOutgoingPacket.java | 4 -- .../PledgeReceiveSubPledgeCreated.java | 3 +- .../serverpackets/RecipeItemMakeInfo.java | 4 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SystemMessage.java | 5 +- .../WareHouseWithdrawalList.java | 3 +- .../gameserver/network/PacketLogger.java | 42 ++++++++++++++++ .../network/clientpackets/Action.java | 3 +- .../network/clientpackets/AddTradeItem.java | 5 +- .../clientpackets/CannotMoveAnymore.java | 2 +- .../clientpackets/CharacterCreate.java | 9 ++-- .../clientpackets/CharacterDelete.java | 5 +- .../network/clientpackets/EndScenePlayer.java | 2 +- .../network/clientpackets/EnterWorld.java | 3 +- .../network/clientpackets/ExGetOnAirShip.java | 12 +++-- .../network/clientpackets/GameGuardReply.java | 4 +- .../clientpackets/IClientIncomingPacket.java | 3 -- .../clientpackets/MultiSellChoose.java | 15 +++--- .../clientpackets/RequestAcquireSkill.java | 7 +-- .../RequestAcquireSkillInfo.java | 5 +- .../clientpackets/RequestActionUse.java | 10 ++-- .../network/clientpackets/RequestBlock.java | 3 +- .../network/clientpackets/RequestBuyItem.java | 3 +- .../clientpackets/RequestBypassToServer.java | 10 ++-- .../clientpackets/RequestCrystallizeItem.java | 5 +- .../clientpackets/RequestDestroyItem.java | 4 +- .../clientpackets/RequestDropItem.java | 3 +- .../clientpackets/RequestExChangeName.java | 3 +- .../RequestExCubeGameChangeTeam.java | 3 +- .../RequestExCubeGameReadyAnswer.java | 3 +- .../clientpackets/RequestExFishRanking.java | 3 +- .../RequestExMagicSkillUseGround.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestFortressMapInfo.java | 3 +- .../clientpackets/RequestGetBossRecord.java | 3 +- .../clientpackets/RequestGetItemFromPet.java | 3 +- .../clientpackets/RequestGiveItemToPet.java | 3 +- .../clientpackets/RequestHennaEquip.java | 3 +- .../clientpackets/RequestHennaItemInfo.java | 3 +- .../RequestHennaItemRemoveInfo.java | 4 +- .../clientpackets/RequestHennaRemove.java | 3 +- .../clientpackets/RequestLinkHtml.java | 7 +-- .../clientpackets/RequestMagicSkillList.java | 3 +- .../clientpackets/RequestMagicSkillUse.java | 2 +- .../RequestOustPledgeMember.java | 3 +- .../clientpackets/RequestPCCafeCouponUse.java | 3 +- .../clientpackets/RequestPackageSend.java | 7 +-- .../clientpackets/RequestPetUseItem.java | 3 +- .../RequestPetitionFeedback.java | 3 +- .../RequestPledgeMemberInfo.java | 4 +- .../clientpackets/RequestPreviewItem.java | 6 +-- .../clientpackets/RequestPrivateStoreBuy.java | 3 +- .../RequestPrivateStoreSell.java | 3 +- .../clientpackets/RequestRefundItem.java | 3 +- .../RequestReplySurrenderPledgeWar.java | 3 +- .../clientpackets/RequestRestartPoint.java | 11 +++-- .../clientpackets/RequestSendPost.java | 5 +- .../RequestSetCastleSiegeTime.java | 11 +++-- .../network/clientpackets/Say2.java | 11 +++-- .../SendWareHouseDepositList.java | 7 +-- .../SendWareHouseWithDrawList.java | 5 +- .../network/clientpackets/UseItem.java | 3 +- .../commission/RequestCommissionRegister.java | 15 +++--- .../RequestCrystallizeEstimate.java | 3 +- .../RequestOneDayRewardReceive.java | 3 +- .../friend/RequestAnswerFriendInvite.java | 4 +- .../friend/RequestFriendDel.java | 4 +- .../mentoring/ConfirmMenteeAdd.java | 4 +- .../pledgebonus/RequestPledgeBonusReward.java | 3 +- .../primeshop/RequestBRProductList.java | 3 +- .../sayune/RequestFlyMoveStart.java | 5 +- .../shuttle/RequestShuttleGetOn.java | 3 +- .../serverpackets/AbstractHtmlPacket.java | 7 ++- .../serverpackets/ExReplyReceivedPost.java | 3 +- .../serverpackets/ExReplySentPost.java | 3 +- .../serverpackets/ExShowCastleInfo.java | 3 +- .../serverpackets/IClientOutgoingPacket.java | 4 -- .../PledgeReceiveSubPledgeCreated.java | 3 +- .../serverpackets/RecipeItemMakeInfo.java | 4 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SystemMessage.java | 5 +- .../WareHouseWithdrawalList.java | 3 +- .../gameserver/network/PacketLogger.java | 42 ++++++++++++++++ .../network/clientpackets/Action.java | 3 +- .../network/clientpackets/AddTradeItem.java | 5 +- .../clientpackets/CannotMoveAnymore.java | 2 +- .../clientpackets/CharacterCreate.java | 9 ++-- .../clientpackets/CharacterDelete.java | 5 +- .../network/clientpackets/EndScenePlayer.java | 2 +- .../network/clientpackets/EnterWorld.java | 3 +- .../network/clientpackets/ExGetOnAirShip.java | 12 +++-- .../network/clientpackets/GameGuardReply.java | 4 +- .../clientpackets/IClientIncomingPacket.java | 3 -- .../clientpackets/MultiSellChoose.java | 15 +++--- .../clientpackets/RequestAcquireSkill.java | 7 +-- .../RequestAcquireSkillInfo.java | 5 +- .../clientpackets/RequestActionUse.java | 10 ++-- .../network/clientpackets/RequestBlock.java | 3 +- .../network/clientpackets/RequestBuyItem.java | 3 +- .../clientpackets/RequestBypassToServer.java | 10 ++-- .../clientpackets/RequestCrystallizeItem.java | 5 +- .../clientpackets/RequestDestroyItem.java | 4 +- .../clientpackets/RequestDropItem.java | 3 +- .../clientpackets/RequestExChangeName.java | 3 +- .../RequestExCubeGameChangeTeam.java | 3 +- .../RequestExCubeGameReadyAnswer.java | 3 +- .../clientpackets/RequestExFishRanking.java | 3 +- .../RequestExMagicSkillUseGround.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestFortressMapInfo.java | 3 +- .../clientpackets/RequestGetBossRecord.java | 3 +- .../clientpackets/RequestGetItemFromPet.java | 3 +- .../clientpackets/RequestGiveItemToPet.java | 3 +- .../clientpackets/RequestHennaEquip.java | 3 +- .../clientpackets/RequestHennaItemInfo.java | 3 +- .../RequestHennaItemRemoveInfo.java | 4 +- .../clientpackets/RequestHennaRemove.java | 3 +- .../clientpackets/RequestLinkHtml.java | 7 +-- .../clientpackets/RequestMagicSkillList.java | 3 +- .../clientpackets/RequestMagicSkillUse.java | 2 +- .../RequestOustPledgeMember.java | 3 +- .../clientpackets/RequestPCCafeCouponUse.java | 3 +- .../clientpackets/RequestPackageSend.java | 7 +-- .../clientpackets/RequestPetUseItem.java | 3 +- .../RequestPetitionFeedback.java | 3 +- .../RequestPledgeMemberInfo.java | 4 +- .../clientpackets/RequestPreviewItem.java | 6 +-- .../clientpackets/RequestPrivateStoreBuy.java | 3 +- .../RequestPrivateStoreSell.java | 3 +- .../clientpackets/RequestRefundItem.java | 3 +- .../RequestReplySurrenderPledgeWar.java | 3 +- .../clientpackets/RequestRestartPoint.java | 11 +++-- .../clientpackets/RequestSendPost.java | 5 +- .../RequestSetCastleSiegeTime.java | 11 +++-- .../network/clientpackets/Say2.java | 11 +++-- .../SendWareHouseDepositList.java | 7 +-- .../SendWareHouseWithDrawList.java | 5 +- .../network/clientpackets/UseItem.java | 3 +- .../commission/RequestCommissionRegister.java | 15 +++--- .../RequestCrystallizeEstimate.java | 3 +- .../RequestOneDayRewardReceive.java | 3 +- .../friend/RequestAnswerFriendInvite.java | 4 +- .../friend/RequestFriendDel.java | 4 +- .../mentoring/ConfirmMenteeAdd.java | 4 +- .../pledgebonus/RequestPledgeBonusReward.java | 3 +- .../primeshop/RequestBRProductList.java | 3 +- .../sayune/RequestFlyMoveStart.java | 5 +- .../shuttle/RequestShuttleGetOn.java | 3 +- .../serverpackets/AbstractHtmlPacket.java | 7 ++- .../serverpackets/ExReplyReceivedPost.java | 3 +- .../serverpackets/ExReplySentPost.java | 3 +- .../serverpackets/ExShowCastleInfo.java | 3 +- .../serverpackets/IClientOutgoingPacket.java | 4 -- .../PledgeReceiveSubPledgeCreated.java | 3 +- .../serverpackets/RecipeItemMakeInfo.java | 4 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SystemMessage.java | 5 +- .../WareHouseWithdrawalList.java | 3 +- .../gameserver/network/PacketLogger.java | 42 ++++++++++++++++ .../network/clientpackets/Action.java | 3 +- .../network/clientpackets/AddTradeItem.java | 5 +- .../clientpackets/CannotMoveAnymore.java | 2 +- .../clientpackets/CharacterCreate.java | 9 ++-- .../clientpackets/CharacterDelete.java | 5 +- .../network/clientpackets/EndScenePlayer.java | 2 +- .../network/clientpackets/EnterWorld.java | 3 +- .../network/clientpackets/ExGetOnAirShip.java | 12 +++-- .../network/clientpackets/GameGuardReply.java | 4 +- .../clientpackets/IClientIncomingPacket.java | 3 -- .../clientpackets/MultiSellChoose.java | 15 +++--- .../clientpackets/RequestAcquireSkill.java | 7 +-- .../RequestAcquireSkillInfo.java | 5 +- .../clientpackets/RequestActionUse.java | 10 ++-- .../network/clientpackets/RequestBlock.java | 3 +- .../network/clientpackets/RequestBuyItem.java | 3 +- .../clientpackets/RequestBypassToServer.java | 10 ++-- .../clientpackets/RequestCrystallizeItem.java | 5 +- .../clientpackets/RequestDestroyItem.java | 4 +- .../clientpackets/RequestDropItem.java | 3 +- .../clientpackets/RequestExChangeName.java | 3 +- .../RequestExCubeGameChangeTeam.java | 3 +- .../RequestExCubeGameReadyAnswer.java | 3 +- .../clientpackets/RequestExFishRanking.java | 3 +- .../RequestExMagicSkillUseGround.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestFortressMapInfo.java | 3 +- .../clientpackets/RequestGetBossRecord.java | 3 +- .../clientpackets/RequestGetItemFromPet.java | 3 +- .../clientpackets/RequestGiveItemToPet.java | 3 +- .../clientpackets/RequestHennaEquip.java | 3 +- .../clientpackets/RequestHennaItemInfo.java | 3 +- .../RequestHennaItemRemoveInfo.java | 4 +- .../clientpackets/RequestHennaRemove.java | 3 +- .../clientpackets/RequestLinkHtml.java | 7 +-- .../clientpackets/RequestMagicSkillList.java | 3 +- .../clientpackets/RequestMagicSkillUse.java | 2 +- .../RequestOustPledgeMember.java | 3 +- .../clientpackets/RequestPCCafeCouponUse.java | 3 +- .../clientpackets/RequestPackageSend.java | 7 +-- .../clientpackets/RequestPetUseItem.java | 3 +- .../RequestPetitionFeedback.java | 3 +- .../RequestPledgeMemberInfo.java | 4 +- .../clientpackets/RequestPreviewItem.java | 6 +-- .../clientpackets/RequestPrivateStoreBuy.java | 3 +- .../RequestPrivateStoreSell.java | 3 +- .../clientpackets/RequestRefundItem.java | 3 +- .../RequestReplySurrenderPledgeWar.java | 3 +- .../clientpackets/RequestRestartPoint.java | 11 +++-- .../clientpackets/RequestSendPost.java | 5 +- .../RequestSetCastleSiegeTime.java | 11 +++-- .../network/clientpackets/Say2.java | 11 +++-- .../SendWareHouseDepositList.java | 7 +-- .../SendWareHouseWithDrawList.java | 5 +- .../network/clientpackets/UseItem.java | 3 +- .../commission/RequestCommissionRegister.java | 15 +++--- .../RequestCrystallizeEstimate.java | 3 +- .../RequestOneDayRewardReceive.java | 3 +- .../friend/RequestAnswerFriendInvite.java | 4 +- .../friend/RequestFriendDel.java | 4 +- .../mentoring/ConfirmMenteeAdd.java | 4 +- .../pledgebonus/RequestPledgeBonusReward.java | 3 +- .../primeshop/RequestBRProductList.java | 3 +- .../sayune/RequestFlyMoveStart.java | 5 +- .../shuttle/RequestShuttleGetOn.java | 3 +- .../serverpackets/AbstractHtmlPacket.java | 7 ++- .../serverpackets/ExReplyReceivedPost.java | 3 +- .../serverpackets/ExReplySentPost.java | 3 +- .../serverpackets/ExShowCastleInfo.java | 3 +- .../serverpackets/IClientOutgoingPacket.java | 4 -- .../PledgeReceiveSubPledgeCreated.java | 3 +- .../serverpackets/RecipeItemMakeInfo.java | 4 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SystemMessage.java | 5 +- .../WareHouseWithdrawalList.java | 3 +- .../gameserver/network/PacketLogger.java | 42 ++++++++++++++++ .../network/clientpackets/Action.java | 3 +- .../network/clientpackets/AddTradeItem.java | 5 +- .../clientpackets/CannotMoveAnymore.java | 2 +- .../clientpackets/CharacterCreate.java | 9 ++-- .../clientpackets/CharacterDelete.java | 5 +- .../network/clientpackets/EndScenePlayer.java | 2 +- .../network/clientpackets/EnterWorld.java | 3 +- .../network/clientpackets/ExGetOnAirShip.java | 12 +++-- .../network/clientpackets/ExOpenHtml.java | 3 +- .../clientpackets/ExRequestTeleport.java | 3 +- .../network/clientpackets/GameGuardReply.java | 4 +- .../clientpackets/IClientIncomingPacket.java | 3 -- .../clientpackets/MultiSellChoose.java | 15 +++--- .../clientpackets/RequestAcquireSkill.java | 7 +-- .../RequestAcquireSkillInfo.java | 5 +- .../clientpackets/RequestActionUse.java | 10 ++-- .../network/clientpackets/RequestBlock.java | 3 +- .../network/clientpackets/RequestBuyItem.java | 3 +- .../clientpackets/RequestBypassToServer.java | 10 ++-- .../clientpackets/RequestCrystallizeItem.java | 5 +- .../clientpackets/RequestDestroyItem.java | 4 +- .../clientpackets/RequestDropItem.java | 3 +- .../clientpackets/RequestExChangeName.java | 3 +- .../RequestExCubeGameChangeTeam.java | 3 +- .../RequestExCubeGameReadyAnswer.java | 3 +- .../clientpackets/RequestExFishRanking.java | 3 +- .../RequestExMagicSkillUseGround.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestFortressMapInfo.java | 3 +- .../clientpackets/RequestGetBossRecord.java | 3 +- .../clientpackets/RequestGetItemFromPet.java | 3 +- .../clientpackets/RequestGiveItemToPet.java | 3 +- .../clientpackets/RequestHennaEquip.java | 3 +- .../clientpackets/RequestHennaItemInfo.java | 3 +- .../RequestHennaItemRemoveInfo.java | 4 +- .../clientpackets/RequestHennaRemove.java | 3 +- .../clientpackets/RequestLinkHtml.java | 7 +-- .../clientpackets/RequestMagicSkillList.java | 3 +- .../clientpackets/RequestMagicSkillUse.java | 2 +- .../RequestOustPledgeMember.java | 3 +- .../clientpackets/RequestPCCafeCouponUse.java | 3 +- .../clientpackets/RequestPackageSend.java | 7 +-- .../clientpackets/RequestPetUseItem.java | 3 +- .../RequestPetitionFeedback.java | 3 +- .../RequestPledgeMemberInfo.java | 4 +- .../clientpackets/RequestPreviewItem.java | 6 +-- .../clientpackets/RequestPrivateStoreBuy.java | 3 +- .../RequestPrivateStoreSell.java | 3 +- .../clientpackets/RequestRefundItem.java | 3 +- .../RequestReplySurrenderPledgeWar.java | 3 +- .../clientpackets/RequestRestartPoint.java | 11 +++-- .../clientpackets/RequestSendPost.java | 5 +- .../RequestSetCastleSiegeTime.java | 11 +++-- .../network/clientpackets/Say2.java | 11 +++-- .../SendWareHouseDepositList.java | 7 +-- .../SendWareHouseWithDrawList.java | 5 +- .../network/clientpackets/UseItem.java | 3 +- .../classchange/ExRequestClassChange.java | 3 +- .../commission/RequestCommissionRegister.java | 15 +++--- .../RequestCrystallizeEstimate.java | 3 +- .../RequestOneDayRewardReceive.java | 3 +- .../friend/RequestAnswerFriendInvite.java | 4 +- .../friend/RequestFriendDel.java | 4 +- .../mentoring/ConfirmMenteeAdd.java | 4 +- .../pledgebonus/RequestPledgeBonusReward.java | 3 +- .../primeshop/RequestBRProductList.java | 3 +- .../sayune/RequestFlyMoveStart.java | 5 +- .../shuttle/RequestShuttleGetOn.java | 3 +- .../serverpackets/AbstractHtmlPacket.java | 7 ++- .../serverpackets/ExReplyReceivedPost.java | 3 +- .../serverpackets/ExReplySentPost.java | 3 +- .../serverpackets/ExShowCastleInfo.java | 3 +- .../serverpackets/IClientOutgoingPacket.java | 4 -- .../PledgeReceiveSubPledgeCreated.java | 3 +- .../serverpackets/RecipeItemMakeInfo.java | 4 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SystemMessage.java | 5 +- .../WareHouseWithdrawalList.java | 3 +- .../ranking/ExOlympiadHeroAndLegendInfo.java | 3 +- .../ranking/ExOlympiadMyRankingInfo.java | 5 +- .../gameserver/network/PacketLogger.java | 42 ++++++++++++++++ .../network/clientpackets/Action.java | 3 +- .../network/clientpackets/AddTradeItem.java | 5 +- .../clientpackets/CannotMoveAnymore.java | 2 +- .../clientpackets/CharacterCreate.java | 9 ++-- .../clientpackets/CharacterDelete.java | 5 +- .../network/clientpackets/EndScenePlayer.java | 2 +- .../network/clientpackets/EnterWorld.java | 3 +- .../network/clientpackets/ExGetOnAirShip.java | 12 +++-- .../network/clientpackets/GameGuardReply.java | 4 +- .../clientpackets/IClientIncomingPacket.java | 3 -- .../clientpackets/MultiSellChoose.java | 13 ++--- .../clientpackets/RequestAcquireSkill.java | 7 +-- .../RequestAcquireSkillInfo.java | 5 +- .../clientpackets/RequestActionUse.java | 10 ++-- .../network/clientpackets/RequestBlock.java | 3 +- .../network/clientpackets/RequestBuyItem.java | 3 +- .../clientpackets/RequestBypassToServer.java | 10 ++-- .../clientpackets/RequestCrystallizeItem.java | 5 +- .../clientpackets/RequestDestroyItem.java | 4 +- .../clientpackets/RequestDropItem.java | 3 +- .../clientpackets/RequestExChangeName.java | 3 +- .../RequestExCubeGameChangeTeam.java | 3 +- .../RequestExCubeGameReadyAnswer.java | 3 +- .../clientpackets/RequestExFishRanking.java | 3 +- .../RequestExMagicSkillUseGround.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestFortressMapInfo.java | 3 +- .../clientpackets/RequestGetBossRecord.java | 3 +- .../clientpackets/RequestGetItemFromPet.java | 3 +- .../clientpackets/RequestGiveItemToPet.java | 3 +- .../clientpackets/RequestHennaEquip.java | 3 +- .../clientpackets/RequestHennaItemInfo.java | 3 +- .../RequestHennaItemRemoveInfo.java | 4 +- .../clientpackets/RequestHennaRemove.java | 3 +- .../clientpackets/RequestLinkHtml.java | 7 +-- .../clientpackets/RequestMagicSkillList.java | 3 +- .../clientpackets/RequestMagicSkillUse.java | 2 +- .../RequestOustPledgeMember.java | 3 +- .../clientpackets/RequestPCCafeCouponUse.java | 3 +- .../clientpackets/RequestPackageSend.java | 7 +-- .../clientpackets/RequestPetUseItem.java | 3 +- .../RequestPetitionFeedback.java | 3 +- .../RequestPledgeMemberInfo.java | 4 +- .../clientpackets/RequestPreviewItem.java | 6 +-- .../clientpackets/RequestPrivateStoreBuy.java | 3 +- .../RequestPrivateStoreSell.java | 3 +- .../clientpackets/RequestRefundItem.java | 3 +- .../RequestReplySurrenderPledgeWar.java | 3 +- .../clientpackets/RequestRestartPoint.java | 11 +++-- .../clientpackets/RequestSendPost.java | 5 +- .../RequestSetCastleSiegeTime.java | 11 +++-- .../network/clientpackets/Say2.java | 11 +++-- .../SendWareHouseDepositList.java | 7 +-- .../SendWareHouseWithDrawList.java | 5 +- .../network/clientpackets/UseItem.java | 3 +- .../commission/RequestCommissionRegister.java | 13 ++--- .../RequestCrystallizeEstimate.java | 3 +- .../RequestOneDayRewardReceive.java | 3 +- .../friend/RequestAnswerFriendInvite.java | 4 +- .../friend/RequestFriendDel.java | 4 +- .../mentoring/ConfirmMenteeAdd.java | 4 +- .../pledgebonus/RequestPledgeBonusReward.java | 3 +- .../primeshop/RequestBRProductList.java | 3 +- .../sayune/RequestFlyMoveStart.java | 5 +- .../shuttle/RequestShuttleGetOn.java | 3 +- .../serverpackets/AbstractHtmlPacket.java | 7 ++- .../serverpackets/ExReplyReceivedPost.java | 3 +- .../serverpackets/ExReplySentPost.java | 3 +- .../serverpackets/ExShowCastleInfo.java | 3 +- .../serverpackets/IClientOutgoingPacket.java | 4 -- .../PledgeReceiveSubPledgeCreated.java | 3 +- .../serverpackets/RecipeItemMakeInfo.java | 4 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SystemMessage.java | 5 +- .../WareHouseWithdrawalList.java | 3 +- .../gameserver/network/PacketLogger.java | 42 ++++++++++++++++ .../network/clientpackets/Action.java | 3 +- .../network/clientpackets/AddTradeItem.java | 5 +- .../clientpackets/CannotMoveAnymore.java | 2 +- .../clientpackets/CharacterCreate.java | 9 ++-- .../clientpackets/CharacterDelete.java | 5 +- .../network/clientpackets/EndScenePlayer.java | 2 +- .../network/clientpackets/EnterWorld.java | 3 +- .../network/clientpackets/ExGetOnAirShip.java | 12 +++-- .../network/clientpackets/ExOpenHtml.java | 3 +- .../network/clientpackets/GameGuardReply.java | 4 +- .../clientpackets/IClientIncomingPacket.java | 3 -- .../clientpackets/MultiSellChoose.java | 15 +++--- .../clientpackets/RequestAcquireSkill.java | 7 +-- .../RequestAcquireSkillInfo.java | 5 +- .../clientpackets/RequestActionUse.java | 10 ++-- .../network/clientpackets/RequestBlock.java | 3 +- .../network/clientpackets/RequestBuyItem.java | 3 +- .../clientpackets/RequestBypassToServer.java | 10 ++-- .../clientpackets/RequestCrystallizeItem.java | 5 +- .../clientpackets/RequestDestroyItem.java | 4 +- .../clientpackets/RequestDropItem.java | 3 +- .../clientpackets/RequestExChangeName.java | 3 +- .../RequestExCubeGameChangeTeam.java | 3 +- .../RequestExCubeGameReadyAnswer.java | 3 +- .../clientpackets/RequestExFishRanking.java | 3 +- .../RequestExMagicSkillUseGround.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestFortressMapInfo.java | 3 +- .../clientpackets/RequestGetBossRecord.java | 3 +- .../clientpackets/RequestHennaEquip.java | 3 +- .../clientpackets/RequestHennaItemInfo.java | 3 +- .../RequestHennaItemRemoveInfo.java | 4 +- .../clientpackets/RequestHennaRemove.java | 3 +- .../clientpackets/RequestLinkHtml.java | 7 +-- .../clientpackets/RequestMagicSkillList.java | 3 +- .../clientpackets/RequestMagicSkillUse.java | 2 +- .../RequestOustPledgeMember.java | 3 +- .../clientpackets/RequestPCCafeCouponUse.java | 3 +- .../clientpackets/RequestPackageSend.java | 7 +-- .../RequestPetitionFeedback.java | 3 +- .../RequestPledgeMemberInfo.java | 4 +- .../clientpackets/RequestPreviewItem.java | 6 +-- .../clientpackets/RequestPrivateStoreBuy.java | 3 +- .../RequestPrivateStoreSell.java | 3 +- .../clientpackets/RequestRefundItem.java | 3 +- .../RequestReplySurrenderPledgeWar.java | 3 +- .../clientpackets/RequestRestartPoint.java | 11 +++-- .../clientpackets/RequestSendPost.java | 5 +- .../RequestSetCastleSiegeTime.java | 11 +++-- .../network/clientpackets/Say2.java | 11 +++-- .../SendWareHouseDepositList.java | 7 +-- .../SendWareHouseWithDrawList.java | 5 +- .../network/clientpackets/UseItem.java | 3 +- .../classchange/ExRequestClassChange.java | 3 +- .../commission/RequestCommissionRegister.java | 15 +++--- .../RequestCrystallizeEstimate.java | 3 +- .../RequestOneDayRewardReceive.java | 3 +- .../ensoul/RequestItemEnsoul.java | 26 +++++----- .../friend/RequestAnswerFriendInvite.java | 4 +- .../friend/RequestFriendDel.java | 4 +- .../mentoring/ConfirmMenteeAdd.java | 4 +- .../pet/RequestGetItemFromPet.java | 3 +- .../pet/RequestGiveItemToPet.java | 3 +- .../clientpackets/pet/RequestPetUseItem.java | 3 +- .../pledgebonus/RequestPledgeBonusReward.java | 3 +- .../primeshop/RequestBRProductList.java | 3 +- .../RequestRaidBossSpawnInfo.java | 2 +- .../sayune/RequestFlyMoveStart.java | 5 +- .../shuttle/RequestShuttleGetOn.java | 3 +- .../teleports/ExRequestTeleport.java | 3 +- .../ExRequestTeleportFavoritesAddDel.java | 5 +- .../teleports/ExTeleportToRaidPosition.java | 3 +- .../serverpackets/AbstractHtmlPacket.java | 7 ++- .../serverpackets/ExReplyReceivedPost.java | 3 +- .../serverpackets/ExReplySentPost.java | 3 +- .../serverpackets/ExShowCastleInfo.java | 3 +- .../serverpackets/IClientOutgoingPacket.java | 4 -- .../PledgeReceiveSubPledgeCreated.java | 3 +- .../serverpackets/RecipeItemMakeInfo.java | 4 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SystemMessage.java | 5 +- .../WareHouseWithdrawalList.java | 3 +- .../ranking/ExOlympiadHeroAndLegendInfo.java | 3 +- .../ranking/ExOlympiadMyRankingInfo.java | 5 +- .../gameserver/network/PacketLogger.java | 42 ++++++++++++++++ .../network/clientpackets/Action.java | 3 +- .../network/clientpackets/AddTradeItem.java | 5 +- .../clientpackets/CannotMoveAnymore.java | 2 +- .../clientpackets/CharacterCreate.java | 9 ++-- .../clientpackets/CharacterDelete.java | 5 +- .../network/clientpackets/EndScenePlayer.java | 2 +- .../network/clientpackets/EnterWorld.java | 3 +- .../network/clientpackets/ExGetOnAirShip.java | 12 +++-- .../network/clientpackets/ExOpenHtml.java | 3 +- .../network/clientpackets/GameGuardReply.java | 4 +- .../clientpackets/IClientIncomingPacket.java | 3 -- .../clientpackets/MultiSellChoose.java | 15 +++--- .../clientpackets/RequestAcquireSkill.java | 7 +-- .../RequestAcquireSkillInfo.java | 5 +- .../clientpackets/RequestActionUse.java | 10 ++-- .../network/clientpackets/RequestBlock.java | 3 +- .../network/clientpackets/RequestBuyItem.java | 3 +- .../clientpackets/RequestBypassToServer.java | 10 ++-- .../clientpackets/RequestCrystallizeItem.java | 5 +- .../clientpackets/RequestDestroyItem.java | 4 +- .../clientpackets/RequestDropItem.java | 3 +- .../clientpackets/RequestExChangeName.java | 3 +- .../RequestExCubeGameChangeTeam.java | 3 +- .../RequestExCubeGameReadyAnswer.java | 3 +- .../clientpackets/RequestExFishRanking.java | 3 +- .../RequestExMagicSkillUseGround.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestFortressMapInfo.java | 3 +- .../clientpackets/RequestGetBossRecord.java | 3 +- .../clientpackets/RequestHennaEquip.java | 3 +- .../clientpackets/RequestHennaItemInfo.java | 3 +- .../RequestHennaItemRemoveInfo.java | 4 +- .../clientpackets/RequestHennaRemove.java | 3 +- .../clientpackets/RequestLinkHtml.java | 7 +-- .../clientpackets/RequestMagicSkillList.java | 3 +- .../clientpackets/RequestMagicSkillUse.java | 2 +- .../RequestOustPledgeMember.java | 3 +- .../clientpackets/RequestPCCafeCouponUse.java | 3 +- .../clientpackets/RequestPackageSend.java | 7 +-- .../RequestPetitionFeedback.java | 3 +- .../RequestPledgeMemberInfo.java | 4 +- .../clientpackets/RequestPreviewItem.java | 6 +-- .../clientpackets/RequestPrivateStoreBuy.java | 3 +- .../RequestPrivateStoreSell.java | 3 +- .../clientpackets/RequestRefundItem.java | 3 +- .../RequestReplySurrenderPledgeWar.java | 3 +- .../clientpackets/RequestRestartPoint.java | 11 +++-- .../clientpackets/RequestSendPost.java | 5 +- .../RequestSetCastleSiegeTime.java | 11 +++-- .../network/clientpackets/Say2.java | 11 +++-- .../SendWareHouseDepositList.java | 7 +-- .../SendWareHouseWithDrawList.java | 5 +- .../network/clientpackets/UseItem.java | 3 +- .../classchange/ExRequestClassChange.java | 3 +- .../commission/RequestCommissionRegister.java | 15 +++--- .../RequestCrystallizeEstimate.java | 3 +- .../RequestOneDayRewardReceive.java | 3 +- .../ensoul/RequestItemEnsoul.java | 26 +++++----- .../friend/RequestAnswerFriendInvite.java | 4 +- .../friend/RequestFriendDel.java | 4 +- .../mentoring/ConfirmMenteeAdd.java | 4 +- .../pet/RequestGetItemFromPet.java | 3 +- .../pet/RequestGiveItemToPet.java | 3 +- .../clientpackets/pet/RequestPetUseItem.java | 3 +- .../pledgebonus/RequestPledgeBonusReward.java | 3 +- .../primeshop/RequestBRProductList.java | 3 +- .../RequestRaidBossSpawnInfo.java | 2 +- .../sayune/RequestFlyMoveStart.java | 5 +- .../shuttle/RequestShuttleGetOn.java | 3 +- .../teleports/ExRequestTeleport.java | 3 +- .../ExRequestTeleportFavoritesAddDel.java | 5 +- .../teleports/ExTeleportToRaidPosition.java | 3 +- .../serverpackets/AbstractHtmlPacket.java | 7 ++- .../serverpackets/ExReplyReceivedPost.java | 3 +- .../serverpackets/ExReplySentPost.java | 3 +- .../serverpackets/ExShowCastleInfo.java | 3 +- .../serverpackets/IClientOutgoingPacket.java | 4 -- .../PledgeReceiveSubPledgeCreated.java | 3 +- .../serverpackets/RecipeItemMakeInfo.java | 4 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SystemMessage.java | 5 +- .../WareHouseWithdrawalList.java | 3 +- .../ranking/ExOlympiadHeroAndLegendInfo.java | 3 +- .../ranking/ExOlympiadMyRankingInfo.java | 5 +- .../gameserver/network/PacketLogger.java | 42 ++++++++++++++++ .../network/clientpackets/Action.java | 3 +- .../network/clientpackets/AddTradeItem.java | 5 +- .../clientpackets/CannotMoveAnymore.java | 2 +- .../clientpackets/CharacterCreate.java | 9 ++-- .../clientpackets/CharacterDelete.java | 5 +- .../network/clientpackets/EndScenePlayer.java | 2 +- .../network/clientpackets/EnterWorld.java | 3 +- .../network/clientpackets/ExGetOnAirShip.java | 12 +++-- .../network/clientpackets/ExOpenHtml.java | 3 +- .../network/clientpackets/GameGuardReply.java | 4 +- .../clientpackets/IClientIncomingPacket.java | 3 -- .../clientpackets/MultiSellChoose.java | 15 +++--- .../clientpackets/RequestAcquireSkill.java | 7 +-- .../RequestAcquireSkillInfo.java | 5 +- .../clientpackets/RequestActionUse.java | 10 ++-- .../network/clientpackets/RequestBlock.java | 3 +- .../network/clientpackets/RequestBuyItem.java | 3 +- .../clientpackets/RequestBypassToServer.java | 10 ++-- .../clientpackets/RequestCrystallizeItem.java | 5 +- .../clientpackets/RequestDestroyItem.java | 4 +- .../clientpackets/RequestDropItem.java | 3 +- .../clientpackets/RequestExChangeName.java | 3 +- .../RequestExCubeGameChangeTeam.java | 3 +- .../RequestExCubeGameReadyAnswer.java | 3 +- .../clientpackets/RequestExFishRanking.java | 3 +- .../RequestExMagicSkillUseGround.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestFortressMapInfo.java | 3 +- .../clientpackets/RequestGetBossRecord.java | 3 +- .../clientpackets/RequestHennaEquip.java | 3 +- .../clientpackets/RequestHennaItemInfo.java | 3 +- .../RequestHennaItemRemoveInfo.java | 4 +- .../clientpackets/RequestHennaRemove.java | 3 +- .../clientpackets/RequestLinkHtml.java | 7 +-- .../clientpackets/RequestMagicSkillList.java | 3 +- .../clientpackets/RequestMagicSkillUse.java | 2 +- .../RequestOustPledgeMember.java | 3 +- .../clientpackets/RequestPCCafeCouponUse.java | 3 +- .../clientpackets/RequestPackageSend.java | 7 +-- .../RequestPetitionFeedback.java | 3 +- .../RequestPledgeMemberInfo.java | 4 +- .../clientpackets/RequestPreviewItem.java | 6 +-- .../clientpackets/RequestPrivateStoreBuy.java | 3 +- .../RequestPrivateStoreSell.java | 3 +- .../clientpackets/RequestRefundItem.java | 3 +- .../RequestReplySurrenderPledgeWar.java | 3 +- .../clientpackets/RequestRestartPoint.java | 11 +++-- .../clientpackets/RequestSendPost.java | 5 +- .../RequestSetCastleSiegeTime.java | 11 +++-- .../network/clientpackets/Say2.java | 11 +++-- .../SendWareHouseDepositList.java | 7 +-- .../SendWareHouseWithDrawList.java | 5 +- .../network/clientpackets/UseItem.java | 3 +- .../classchange/ExRequestClassChange.java | 3 +- .../commission/RequestCommissionRegister.java | 15 +++--- .../RequestCrystallizeEstimate.java | 3 +- .../RequestOneDayRewardReceive.java | 3 +- .../ensoul/RequestItemEnsoul.java | 26 +++++----- .../friend/RequestAnswerFriendInvite.java | 4 +- .../friend/RequestFriendDel.java | 4 +- .../mentoring/ConfirmMenteeAdd.java | 4 +- .../pet/RequestGetItemFromPet.java | 3 +- .../pet/RequestGiveItemToPet.java | 3 +- .../clientpackets/pet/RequestPetUseItem.java | 3 +- .../pledgebonus/RequestPledgeBonusReward.java | 3 +- .../primeshop/RequestBRProductList.java | 3 +- .../RequestRaidBossSpawnInfo.java | 2 +- .../sayune/RequestFlyMoveStart.java | 5 +- .../shuttle/RequestShuttleGetOn.java | 3 +- .../teleports/ExRequestTeleport.java | 3 +- .../ExRequestTeleportFavoritesAddDel.java | 5 +- .../teleports/ExTeleportToRaidPosition.java | 3 +- .../serverpackets/AbstractHtmlPacket.java | 7 ++- .../serverpackets/ExReplyReceivedPost.java | 3 +- .../serverpackets/ExReplySentPost.java | 3 +- .../serverpackets/ExShowCastleInfo.java | 3 +- .../serverpackets/IClientOutgoingPacket.java | 4 -- .../PledgeReceiveSubPledgeCreated.java | 3 +- .../serverpackets/RecipeItemMakeInfo.java | 4 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SystemMessage.java | 5 +- .../WareHouseWithdrawalList.java | 3 +- .../ranking/ExOlympiadHeroAndLegendInfo.java | 3 +- .../ranking/ExOlympiadMyRankingInfo.java | 5 +- 1929 files changed, 6341 insertions(+), 4020 deletions(-) create mode 100644 L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/PacketLogger.java create mode 100644 L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/PacketLogger.java create mode 100644 L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/PacketLogger.java create mode 100644 L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/PacketLogger.java create mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/PacketLogger.java create mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/PacketLogger.java create mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/PacketLogger.java create mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/PacketLogger.java create mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/PacketLogger.java create mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/PacketLogger.java create mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/PacketLogger.java create mode 100644 L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/PacketLogger.java create mode 100644 L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/PacketLogger.java create mode 100644 L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/PacketLogger.java create mode 100644 L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/PacketLogger.java create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/PacketLogger.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/PacketLogger.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/PacketLogger.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/PacketLogger.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/PacketLogger.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/PacketLogger.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/PacketLogger.java create mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/PacketLogger.java create mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/PacketLogger.java create mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/PacketLogger.java diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/PacketLogger.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/PacketLogger.java new file mode 100644 index 0000000000..5b5a083a99 --- /dev/null +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/PacketLogger.java @@ -0,0 +1,42 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.network; + +import java.util.logging.Logger; + +/** + * @author Mobius + */ +public class PacketLogger +{ + private static final Logger LOGGER = Logger.getLogger(PacketLogger.class.getName()); + + public static synchronized void warning(String message) + { + LOGGER.warning(message); + } + + public static synchronized void info(String message) + { + LOGGER.info(message); + } + + public static synchronized void finer(String message) + { + LOGGER.finer(message); + } +} diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 7c343f78be..ef3f4acc18 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -161,7 +162,7 @@ public class Action implements IClientIncomingPacket default: { // Invalid action detected (probably client cheating), log this - LOGGER.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); + PacketLogger.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); client.sendPacket(ActionFailed.STATIC_PACKET); break; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index db177c478d..922a088a0b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; import org.l2jmobius.gameserver.network.serverpackets.TradeOwnAdd; @@ -57,7 +58,7 @@ public class AddTradeItem implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - LOGGER.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); + PacketLogger.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); return; } @@ -67,7 +68,7 @@ public class AddTradeItem implements IClientIncomingPacket // Trade partner not found, cancel trade if (partner != null) { - LOGGER.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); + PacketLogger.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); } player.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE); player.cancelActiveTrade(); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 20134dd2bb..a3236b0d83 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -62,7 +62,7 @@ public class CannotMoveAnymore implements IClientIncomingPacket // player.stopMove(); // // if (Config.DEBUG) - // LOGGER.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ + // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); // StopMove smwl = new StopMove(player); // client.getPlayer().sendPacket(smwl); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 33a024f2cf..2f6dbdfee6 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -43,6 +43,7 @@ import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; import org.l2jmobius.gameserver.network.serverpackets.CharCreateOk; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -124,21 +125,21 @@ public class CharacterCreate implements IClientIncomingPacket if ((_face > 2) || (_face < 0)) { - LOGGER.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairStyle < 0) || ((_sex == 0) && (_hairStyle > 4)) || ((_sex != 0) && (_hairStyle > 6))) { - LOGGER.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairColor > 3) || (_hairColor < 0)) { - LOGGER.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } @@ -303,7 +304,7 @@ public class CharacterCreate implements IClientIncomingPacket final Item item = newChar.getInventory().addItem("Init", ie.getId(), ie.getCount(), newChar, null); if (item == null) { - LOGGER.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); + PacketLogger.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); continue; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java index 86c425fa45..63c3261946 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Level; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.CharacterDeleteFailType; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -25,6 +23,7 @@ import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDelete; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteFail; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteSuccess; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -74,7 +73,7 @@ public class CharacterDelete implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Error:", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1, 0); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java index 5f74c38273..cfe9b20f3d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java @@ -47,7 +47,7 @@ public class EndScenePlayer implements IClientIncomingPacket final MovieHolder holder = player.getMovieHolder(); if ((holder == null) || (holder.getMovie().getClientId() != _movieId)) { - // LOGGER.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); + // PacketLogger.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 2ab48d8c0d..97c6ceef1d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -67,6 +67,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.Die; @@ -148,7 +149,7 @@ public class EnterWorld implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.warning("EnterWorld failed! player returned 'null'."); + PacketLogger.warning("EnterWorld failed! player returned 'null'."); Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java index 8bde20da0a..14e8153478 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java @@ -25,9 +25,13 @@ import org.l2jmobius.gameserver.network.GameClient; */ public class ExGetOnAirShip implements IClientIncomingPacket { + @SuppressWarnings("unused") private int _x; + @SuppressWarnings("unused") private int _y; + @SuppressWarnings("unused") private int _z; + @SuppressWarnings("unused") private int _shipId; @Override @@ -43,9 +47,9 @@ public class ExGetOnAirShip implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("[T1:ExGetOnAirShip] x: " + _x); - LOGGER.info("[T1:ExGetOnAirShip] y: " + _y); - LOGGER.info("[T1:ExGetOnAirShip] z: " + _z); - LOGGER.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); + // PacketLogger.info("[T1:ExGetOnAirShip] x: " + _x); + // PacketLogger.info("[T1:ExGetOnAirShip] y: " + _y); + // PacketLogger.info("[T1:ExGetOnAirShip] z: " + _z); + // PacketLogger.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java index fcdd8335f4..4e91188f5c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java @@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Arrays; -import java.util.logging.Level; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: c dddd @@ -79,7 +79,7 @@ public class GameGuardReply implements IClientIncomingPacket } catch (NoSuchAlgorithmException e) { - LOGGER.log(Level.WARNING, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java index eddff9f891..62e69acd86 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.gameserver.network.GameClient; @@ -27,5 +25,4 @@ import org.l2jmobius.gameserver.network.GameClient; */ public interface IClientIncomingPacket extends IIncomingPacket { - Logger LOGGER = Logger.getLogger(IClientIncomingPacket.class.getName()); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 1e5679950b..444a3f3b3c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -39,6 +39,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -137,14 +138,14 @@ public class MultiSellChoose implements IClientIncomingPacket final MultisellEntryHolder entry = list.getEntries().get(_entryId - 1); // Entry Id begins from 1. We currently use entry IDs as index pointer. if (entry == null) { - LOGGER.severe("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } if (!entry.isStackable() && (_amount > 1)) { - LOGGER.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -168,7 +169,7 @@ public class MultiSellChoose implements IClientIncomingPacket )) //@formatter:on { - LOGGER.severe("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -340,7 +341,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); return; } } @@ -450,7 +451,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); return; } } @@ -629,7 +630,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); + PacketLogger.warning("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); return false; } } 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 17a4f9242d..c9ac9e3d84 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 @@ -45,6 +45,7 @@ import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillDone; import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; @@ -105,7 +106,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if ((_level < 1) || (_level > 100) || (_id < 1) || (_id > 64000)) { Util.handleIllegalPlayerAction(player, "Wrong Packet Data in Aquired Skill", Config.DEFAULT_PUNISH); - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); return; } @@ -119,7 +120,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - LOGGER.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -500,7 +501,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket } default: { - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); break; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 0a570fd3ef..4bb789645a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillInfo; import org.l2jmobius.gameserver.network.serverpackets.ExAcquireSkillInfo; @@ -55,7 +56,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket { if ((_id <= 0) || (_level <= 0)) { - LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); return; } @@ -74,7 +75,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level); if (skill == null) { - LOGGER.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); + PacketLogger.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); return; } 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 5e0a2af0c9..8078d0c10e 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.Arrays; -import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.ActionData; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; @@ -41,8 +41,6 @@ import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList; */ public class RequestActionUse implements IClientIncomingPacket { - private static final Logger LOGGER = Logger.getLogger(RequestActionUse.class.getName()); - private int _actionId; private boolean _ctrlPressed; private boolean _shiftPressed; @@ -93,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } @@ -107,7 +105,7 @@ public class RequestActionUse implements IClientIncomingPacket actionHandler.useAction(player, actionHolder, _ctrlPressed, _shiftPressed); return; } - LOGGER.warning("Couldnt find handler with name: " + actionHolder.getHandler()); + PacketLogger.warning("Couldn't find handler with name: " + actionHolder.getHandler()); return; } @@ -143,7 +141,7 @@ public class RequestActionUse implements IClientIncomingPacket } default: { - LOGGER.warning(player.getName() + ": unhandled action type " + _actionId); + PacketLogger.warning(player.getName() + ": unhandled action type " + _actionId); break; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java index 1fa1214bea..76649875f1 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.data.xml.FakePlayerData; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -130,7 +131,7 @@ public class RequestBlock implements IClientIncomingPacket } default: { - LOGGER.info("Unknown 0xA9 block type: " + _type); + PacketLogger.info("Unknown 0xA9 block type: " + _type); } } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index 2619da4b24..803dbd3fa6 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -161,7 +162,7 @@ public class RequestBuyItem implements IClientIncomingPacket long price = product.getPrice(); if (price < 0) { - LOGGER.warning("ERROR, no price found .. wrong buylist ??"); + PacketLogger.warning("ERROR, no price found .. wrong buylist ??"); client.sendPacket(ActionFailed.STATIC_PACKET); 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 47214311ac..4d8e55bc8e 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.StringTokenizer; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -43,6 +42,7 @@ import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -90,7 +90,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -194,7 +194,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (NumberFormatException nfe) { - LOGGER.log(Level.WARNING, "NFE for command [" + _command + "]", nfe); + PacketLogger.warning("NFE for command [" + _command + "] " + nfe.getMessage()); } } else if (_command.startsWith("_match")) @@ -295,13 +295,13 @@ public class RequestBypassToServer implements IClientIncomingPacket } else { - LOGGER.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); + PacketLogger.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); } } } catch (Exception e) { - LOGGER.log(Level.WARNING, "Exception processing bypass from player " + player.getName() + ": " + _command, e); + PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _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/RequestCrystallizeItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index af45d9defb..03d610fe78 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -59,7 +60,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.finer("RequestCrystalizeItem: activeChar was null"); + // PacketLogger.finer("RequestCrystalizeItem: activeChar was null."); return; } @@ -87,7 +88,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - LOGGER.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index c67449efed..71bb657bf9 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; @@ -33,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -169,7 +169,7 @@ public class RequestDestroyItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not delete pet objectid: ", e); + PacketLogger.warning("Could not delete pet objectid: " + e.getMessage()); } } if (itemToRemove.isTimeLimitedItem()) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 35f1f3c33e..5b6fea109a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.GMAudit; import org.l2jmobius.gameserver.util.Util; @@ -210,7 +211,7 @@ public class RequestDropItem implements IClientIncomingPacket if ((dropedItem != null) && (dropedItem.getId() == Inventory.ADENA_ID) && (dropedItem.getCount() >= 1000000)) { final String msg = "Character (" + player.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")"; - LOGGER.warning(msg); + PacketLogger.warning(msg); AdminData.getInstance().broadcastMessageToGMs(msg); } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java index e3ab837779..e8bfc249c9 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ExNeedToChangeName; /** @@ -42,6 +43,6 @@ public class RequestExChangeName implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); + PacketLogger.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java index 6e4861568e..c2f02f89ad 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chdd d: Arena d: Team @@ -74,7 +75,7 @@ public class RequestExCubeGameChangeTeam implements IClientIncomingPacket } default: { - LOGGER.warning("Wrong Cube Game Team ID: " + _team); + PacketLogger.warning("Wrong Cube Game Team ID: " + _team); break; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java index 009b836b6d..d72fdfc413 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chddd d: Arena d: Answer @@ -64,7 +65,7 @@ public class RequestExCubeGameReadyAnswer implements IClientIncomingPacket } default: { - LOGGER.warning("Unknown Cube Game Answer ID: " + _answer); + PacketLogger.warning("Unknown Cube Game Answer ID: " + _answer); break; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java index ff12adb20d..3347f01941 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) just a trigger @@ -34,6 +35,6 @@ public class RequestExFishRanking implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestExFishRanking"); + PacketLogger.info("C5: RequestExFishRanking"); } } \ No newline at end of file diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 57e8e7d2e5..8851aef463 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; import org.l2jmobius.gameserver.util.Broadcast; @@ -86,7 +87,7 @@ public class RequestExMagicSkillUseGround implements IClientIncomingPacket else { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("No skill found with id " + _skillId + " and level " + level + " !!"); + PacketLogger.warning("No skill found with id " + _skillId + " and level " + level + " !!"); } } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 77093c5f2d..2d9f0456f4 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; @@ -73,7 +74,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket client.sendPacket(new ExPutEnchantTargetItemResult(0)); if (scrollTemplate == null) { - LOGGER.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); + PacketLogger.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); } return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java index 05e09e6dfc..0a4522bf64 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressMapInfo; @@ -43,7 +44,7 @@ public class RequestFortressMapInfo implements IClientIncomingPacket final Fort fort = FortManager.getInstance().getFortById(_fortressId); if (fort == null) { - LOGGER.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); + PacketLogger.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); if (client.getPlayer() == null) { 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 f65a63d325..dc903790d0 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 @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) d @@ -44,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - LOGGER.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning("Player " + 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/RequestGetItemFromPet.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index 2330851024..fc913f182b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.util.Util; /** @@ -78,7 +79,7 @@ public class RequestGetItemFromPet implements IClientIncomingPacket if (pet.transferItem("Transfer", _objectId, _amount, player.getInventory(), player, pet) == null) { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 66fb839f0e..81d0ee6d55 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; @@ -118,7 +119,7 @@ public class RequestGiveItemToPet implements IClientIncomingPacket if (player.transferItem("Transfer", _objectId, _amount, pet.getInventory(), pet) == null) { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } 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 eab1e325f5..04b9115f3d 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 @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaEquipList; @@ -60,7 +61,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.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 fa21b68043..a7c019d65d 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; @@ -52,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - LOGGER.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); } client.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 b943775334..ff96a400c9 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; @@ -50,10 +51,11 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.sendPacket(ActionFailed.STATIC_PACKET); return; } + player.sendPacket(new HennaItemRemoveInfo(henna, player)); } } 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 70e2f43664..2e95a321ee 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -75,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); client.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 53f04488a6..ada67e190c 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -49,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - LOGGER.warning("Player " + actor.getName() + " sent empty html link!"); + PacketLogger.warning("Player " + actor.getName() + " sent empty html link!"); return; } if (_link.contains("..")) { - LOGGER.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); return; } final int htmlObjectId = actor.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - LOGGER.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java index 89adeae67b..2e1c1c83f6 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author UnAfraid @@ -51,7 +52,7 @@ public class RequestMagicSkillList implements IClientIncomingPacket if (player.getObjectId() != _objectId) { - LOGGER.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); + PacketLogger.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 9432941937..a228079092 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -64,7 +64,7 @@ public class RequestMagicSkillUse implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); // if (_magicId > 0) // { - // LOGGER.warning("Skill Id " + _magicId + " not found in player: " + player); + // PacketLogger.warning("Skill Id " + _magicId + " not found in player: " + player); // } return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 5fbcac0eca..9149ce1284 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListDelete; @@ -71,7 +72,7 @@ public class RequestOustPledgeMember implements IClientIncomingPacket final ClanMember member = clan.getClanMember(_target); if (member == null) { - LOGGER.warning("Target (" + _target + ") is not member of the clan"); + PacketLogger.warning("Target (" + _target + ") is not member of the clan"); return; } if (member.isOnline() && member.getPlayer().isInCombat()) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java index 9702554c3b..209835b319 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) S @@ -37,6 +38,6 @@ public class RequestPCCafeCouponUse implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestPCCafeCouponUse: S: " + _str); + PacketLogger.info("C5: RequestPCCafeCouponUse: S: " + _str); } } 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 e4376f9ad5..14eb0ff29b 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 @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -120,7 +121,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item item = player.checkItemManipulation(i.getId(), i.getCount(), "freight"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); warehouse.deleteMe(); return; } @@ -169,7 +170,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); warehouse.deleteMe(); return; } @@ -177,7 +178,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem("Trade", i.getId(), i.getCount(), warehouse, player, null); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 26cfaf9835..d8b2285a2d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -136,7 +137,7 @@ public class RequestPetUseItem implements IClientIncomingPacket else { player.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM); - LOGGER.warning("No item handler registered for itemId: " + item.getId()); + PacketLogger.warning("No item handler registered for itemId: " + item.getId()); } } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index 8ece2b3ec7..fec0dc36a0 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -25,6 +25,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Plim @@ -74,7 +75,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket } catch (SQLException e) { - LOGGER.severe("Error while saving petition feedback"); + PacketLogger.warning("Error while saving petition feedback."); } } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java index d212481717..3459b04c80 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java @@ -44,8 +44,8 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket @Override public void run(GameClient client) { - // LOGGER.info("C5: RequestPledgeMemberInfo d:"+_unk1); - // LOGGER.info("C5: RequestPledgeMemberInfo S:"+_player); + // PacketLogger.info("C5: RequestPledgeMemberInfo d:"+_unk1); + // PacketLogger.info("C5: RequestPledgeMemberInfo S:"+_player); final Player player = client.getPlayer(); if (player == null) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index e56c105cf4..44bbd9d34c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.HashMap; import java.util.Map; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -38,6 +37,7 @@ import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; @@ -74,7 +74,7 @@ public class RequestPreviewItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } @@ -152,7 +152,7 @@ public class RequestPreviewItem implements IClientIncomingPacket final Merchant merchant = (target instanceof Merchant) ? (Merchant) target : null; if (merchant == null) { - LOGGER.warning("Null merchant!"); + PacketLogger.warning(getClass().getSimpleName() + ": Null merchant!"); 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 251757c0ba..94958bc4fe 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.util.Util; @@ -145,7 +146,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if (result > 1) { - LOGGER.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); } return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java index 6892b2c4f6..f571151603 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; /** @@ -126,7 +127,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket if (!storeList.privateStoreSell(player, _items)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index a4010ca2cb..1632df189f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -193,7 +194,7 @@ public class RequestRefundItem implements IClientIncomingPacket final Item item = player.getRefund().transferItem("Refund", objectIds[i], Long.MAX_VALUE, player.getInventory(), player, player.getLastFolkNPC()); if (item == null) { - LOGGER.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index ee78579ea4..8a2f42272a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket { @@ -54,7 +55,7 @@ public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket } else { - LOGGER.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); + PacketLogger.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); } player.onTransactionRequest(requestor); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index afc4e65df4..08ad2c7763 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @version $Revision: 1.7.2.3.2.6 $ $Date: 2005/03/27 15:29:30 $ @@ -139,7 +140,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if ((player.getClan() == null) || (player.getClan().getHideoutId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.CLANHALL); @@ -167,7 +168,7 @@ public class RequestRestartPoint implements IClientIncomingPacket } else { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); return; } } @@ -199,7 +200,7 @@ public class RequestRestartPoint implements IClientIncomingPacket final Clan clan = player.getClan(); if ((clan == null) || (clan.getFortId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.FORTRESS); @@ -231,7 +232,7 @@ public class RequestRestartPoint implements IClientIncomingPacket if (((siegeClan == null) || siegeClan.getFlag().isEmpty())) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.SIEGEFLAG); @@ -241,7 +242,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if (!player.isGM() && !player.getInventory().haveItemForSelfResurrection()) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); return; } if (player.isGM() || player.destroyItemByItemId("Feather", 10649, 1, player, false) || player.destroyItemByItemId("Feather", 13300, 1, player, false) || player.destroyItemByItemId("Feather", 13128, 1, player, false)) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 33a10fd20c..5014c0b7d0 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExNoticePostSent; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -316,14 +317,14 @@ public class RequestSendPost implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getObjectId(), i.getCount(), "attach"); if ((oldItem == null) || !oldItem.isTradeable() || oldItem.isEquipped()) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); return false; } final Item newItem = player.getInventory().transferItem("SendMail", i.getObjectId(), i.getCount(), attachments, player, msg.getReceiverName() + "[" + msg.getReceiverId() + "]"); if (newItem == null) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java index 2a33016c9a..b5d130046c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -54,16 +55,16 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket final Castle castle = CastleManager.getInstance().getCastleById(_castleId); if ((player == null) || (castle == null)) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); return; } if ((castle.getOwnerId() > 0) && (castle.getOwnerId() != player.getClanId())) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); } else if (!player.isClanLeader()) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); } else if (!castle.isTimeRegistrationOver()) { @@ -79,12 +80,12 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); } } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); } } 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 6d1eea218a..c600906d81 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 @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; @@ -108,7 +109,7 @@ public class Say2 implements IClientIncomingPacket ChatType chatType = ChatType.findByClientId(_type); if (chatType == null) { - LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); + PacketLogger.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -116,7 +117,7 @@ public class Say2 implements IClientIncomingPacket if (_text.isEmpty()) { - LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); + PacketLogger.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -210,7 +211,7 @@ public class Say2 implements IClientIncomingPacket } else { - LOGGER.info("No handler registered for ChatType: " + _type + " Player: " + client); + PacketLogger.info("No handler registered for ChatType: " + _type + " Player: " + client); } } @@ -256,7 +257,7 @@ public class Say2 implements IClientIncomingPacket final Item item = owner.getInventory().getItemByObjectId(id); if (item == null) { - LOGGER.info(client + " trying publish item which doesnt own! ID:" + id); + PacketLogger.info(client + " trying publish item which doesnt own! ID:" + id); return false; } item.publish(); @@ -264,7 +265,7 @@ public class Say2 implements IClientIncomingPacket pos1 = _text.indexOf(8, pos) + 1; if (pos1 == 0) // missing ending tag { - LOGGER.info(client + " sent invalid publish item msg! ID:" + id); + PacketLogger.info(client + " sent invalid publish item msg! ID:" + id); return false; } } 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 ee93527570..7cdde1c7bb 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 @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -127,7 +128,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item item = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); return; } @@ -174,7 +175,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } @@ -186,7 +187,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem(warehouse.getName(), itemHolder.getId(), itemHolder.getCount(), warehouse, player, manager); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 3de872e222..54b59f3ea5 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; @@ -163,13 +164,13 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket final Item oldItem = warehouse.getItemByObjectId(i.getId()); if ((oldItem == null) || (oldItem.getCount() < i.getCount())) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } final Item newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, manager); if (newItem == null) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); return; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index b42c56a13c..cd4f0c7c64 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -43,6 +43,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUseSharedGroupItem; @@ -274,7 +275,7 @@ public class UseItem implements IClientIncomingPacket { if ((etcItem != null) && (etcItem.getHandlerName() != null)) { - LOGGER.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); + PacketLogger.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); } } else if (handler.useItem(player, item, _ctrlPressed)) 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 3695f7c3e8..50a9ace4da 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -56,12 +57,12 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final SkillHolder holder = new SkillHolder(packet.readD(), packet.readD()); if (holder.getSkillLevel() < 1) { - LOGGER.warning("Player " + client + " is trying to learn skill " + holder + " by sending packet with level 0!"); + PacketLogger.warning("Player " + client + " is trying to learn skill " + holder + " by sending packet with level 0!"); return false; } if (_skills.putIfAbsent(holder.getSkillId(), holder) != null) { - LOGGER.warning("Player " + client + " is trying to send two times one skill " + holder + " to learn!"); + PacketLogger.warning("Player " + client + " is trying to send two times one skill " + holder + " to learn!"); return false; } } @@ -85,7 +86,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket if ((player.getAbilityPoints() == 0) || (player.getAbilityPoints() == player.getAbilityPointsUsed())) { - LOGGER.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); return; } @@ -114,7 +115,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final SkillLearn learn = SkillTreeData.getInstance().getAbilitySkill(holder.getSkillId(), holder.getSkillLevel()); if (learn == null) { - LOGGER.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); + PacketLogger.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); client.sendPacket(ActionFailed.STATIC_PACKET); break; } @@ -122,7 +123,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final Skill skill = holder.getSkill(); if (skill == null) { - LOGGER.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); + PacketLogger.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); client.sendPacket(ActionFailed.STATIC_PACKET); break; } @@ -155,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]) { - LOGGER.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!"); + PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -165,7 +166,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket { if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel()) { - LOGGER.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); + PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -174,7 +175,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 3 Learning a skill without having enough points if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points) { - LOGGER.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java index 964fffd4a3..348dc87199 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -98,13 +99,13 @@ public class RequestAlchemyConversion implements IClientIncomingPacket if (data == null) { player.sendPacket(new ExAlchemyConversion(0, 0)); - LOGGER.warning("Missing AlchemyData for skillId: " + _skillId + ", skillLevel: " + _skillLevel); + PacketLogger.warning("Missing AlchemyData for skillId: " + _skillId + ", skillLevel: " + _skillLevel); return; } // if (!_ingredients.equals(data.getIngredients())) // { - // LOGGER.warning("Client ingredients are not same as server ingredients for alchemy conversion player: "+ +"", player); + // PacketLogger.warning("Client ingredients are not same as server ingredients for alchemy conversion player: "+ +"", player); // return; // } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index 68da085e66..a36649b520 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -74,7 +75,7 @@ public class RequestAlchemyTryMixCube implements IClientIncomingPacket else // Player used packet injection tool. { final Player player = client.getPlayer(); - LOGGER.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName()); + PacketLogger.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName()); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return false; } 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 20d84a2bd6..6b2f96e87d 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; @@ -60,37 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - LOGGER.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 30% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 100% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - LOGGER.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - - LOGGER.warning("Player " + player + ": Auction House (15-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); return; - } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - LOGGER.warning("Player " + player + ": Auction House (30-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + 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/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index b4b5bd9011..e4e46a5271 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -94,7 +95,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning(player + ": tried to crystallize " + item.getItem()); + PacketLogger.warning(player + ": tried to crystallize " + item.getItem()); return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java index 3f29f579da..11b1da5ff3 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java @@ -18,12 +18,12 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -102,7 +102,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e); + PacketLogger.warning("Could not add friend objectid: " + e.getMessage()); } } else diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java index 99fc483839..01307e7a6d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -26,6 +25,7 @@ import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -99,7 +99,7 @@ public class RequestFriendDel implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not del friend objectid: ", e); + PacketLogger.warning("Could not del friend objectid: " + e.getMessage()); } } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index 8a327f1f9c..ff61b200fb 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.mentoring; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMenteeAdd; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -93,7 +93,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, e.getMessage(), e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java index ee8910d06e..a53878b794 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductList; @@ -60,7 +61,7 @@ public class RequestBRProductList implements IClientIncomingPacket } default: { - LOGGER.warning(player + " send unhandled product list type: " + _type); + PacketLogger.warning(player + " send unhandled product list type: " + _type); break; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java index e83bf335a7..a828073bb9 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.SayuneRequest; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.type.SayuneZone; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; @@ -72,7 +73,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (zone.getMapId() == -1) { player.sendMessage("That zone is not supported yet!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); return; } @@ -80,7 +81,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (map == null) { player.sendMessage("This zone is not handled yet!!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); return; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java index f1ede4ef0a..41648f184f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Shuttle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -60,7 +61,7 @@ public class RequestShuttleGetOn implements IClientIncomingPacket player.getInVehiclePosition().setXYZ(_x, _y, _z); break; } - LOGGER.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); + PacketLogger.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); } } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 33eeff5060..1b8ddb2042 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -16,11 +16,10 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Level; - import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.util.Util; /** @@ -75,7 +74,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { if (html.length() > 17200) { - LOGGER.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable()); + PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } @@ -94,7 +93,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket if (content == null) { setHtml("My Text is missing:
" + path + ""); - LOGGER.warning("missing html page " + path); + PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index e6b4b8b604..57ed88ac29 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; /** @@ -46,7 +47,7 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index d94dbf4403..75f6596194 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Migi, DS @@ -44,7 +45,7 @@ public class ExReplySentPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index 7a9f6f7389..6ca5edc29b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author KenM @@ -54,7 +55,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); + PacketLogger.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); packet.writeS(""); } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index b27eecaefa..650261e010 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IOutgoingPacket; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; @@ -28,8 +26,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; */ public interface IClientOutgoingPacket extends IOutgoingPacket { - Logger LOGGER = Logger.getLogger(IClientOutgoingPacket.class.getName()); - int[] PAPERDOLL_ORDER = new int[] { Inventory.PAPERDOLL_UNDER, diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 058e1d34b0..818c38a076 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan.SubPledge; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author -Wooden- @@ -56,7 +57,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket } else if (_clan.getClanMember(LeaderId) == null) { - LOGGER.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); + PacketLogger.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); return ""; } else diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index eaa210f4fb..459ffd5837 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.RecipeData; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class RecipeItemMakeInfo implements IClientOutgoingPacket { @@ -56,7 +57,8 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeD(_success ? 1 : 0); // item creation success/failed return true; } - LOGGER.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); + + PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 432ff8ad7f..0a3fe46cb7 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Shows the Siege Info
@@ -78,7 +79,7 @@ public class SiegeInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Null owner for castle: " + _castle.getName()); + PacketLogger.warning("Null owner for castle: " + _castle.getName()); } } else diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 90b90c68eb..f058ddf030 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; @@ -156,7 +157,7 @@ public class SystemMessage implements IClientOutgoingPacket // Mobius: With additional on-screen damage param (popup), length is increased. if (param.getType() != TYPE_POPUP_ID) { - LOGGER.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); + PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } @@ -407,7 +408,7 @@ public class SystemMessage implements IClientOutgoingPacket { if (param == null) { - LOGGER.warning("Found null parameter for SystemMessageId " + _smId); + PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 64fb395dda..6f57005e47 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -24,6 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class WareHouseWithdrawalList extends AbstractItemPacket { @@ -54,7 +55,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket _invSize = player.getInventory().getSize(); if (_player.getActiveWarehouse() == null) { - LOGGER.warning("error while sending withdraw request to: " + _player.getName()); + PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/PacketLogger.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/PacketLogger.java new file mode 100644 index 0000000000..5b5a083a99 --- /dev/null +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/PacketLogger.java @@ -0,0 +1,42 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.network; + +import java.util.logging.Logger; + +/** + * @author Mobius + */ +public class PacketLogger +{ + private static final Logger LOGGER = Logger.getLogger(PacketLogger.class.getName()); + + public static synchronized void warning(String message) + { + LOGGER.warning(message); + } + + public static synchronized void info(String message) + { + LOGGER.info(message); + } + + public static synchronized void finer(String message) + { + LOGGER.finer(message); + } +} diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 7c343f78be..ef3f4acc18 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -161,7 +162,7 @@ public class Action implements IClientIncomingPacket default: { // Invalid action detected (probably client cheating), log this - LOGGER.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); + PacketLogger.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); client.sendPacket(ActionFailed.STATIC_PACKET); break; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index db177c478d..922a088a0b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; import org.l2jmobius.gameserver.network.serverpackets.TradeOwnAdd; @@ -57,7 +58,7 @@ public class AddTradeItem implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - LOGGER.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); + PacketLogger.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); return; } @@ -67,7 +68,7 @@ public class AddTradeItem implements IClientIncomingPacket // Trade partner not found, cancel trade if (partner != null) { - LOGGER.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); + PacketLogger.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); } player.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE); player.cancelActiveTrade(); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 20134dd2bb..a3236b0d83 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -62,7 +62,7 @@ public class CannotMoveAnymore implements IClientIncomingPacket // player.stopMove(); // // if (Config.DEBUG) - // LOGGER.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ + // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); // StopMove smwl = new StopMove(player); // client.getPlayer().sendPacket(smwl); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 33a024f2cf..2f6dbdfee6 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -43,6 +43,7 @@ import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; import org.l2jmobius.gameserver.network.serverpackets.CharCreateOk; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -124,21 +125,21 @@ public class CharacterCreate implements IClientIncomingPacket if ((_face > 2) || (_face < 0)) { - LOGGER.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairStyle < 0) || ((_sex == 0) && (_hairStyle > 4)) || ((_sex != 0) && (_hairStyle > 6))) { - LOGGER.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairColor > 3) || (_hairColor < 0)) { - LOGGER.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } @@ -303,7 +304,7 @@ public class CharacterCreate implements IClientIncomingPacket final Item item = newChar.getInventory().addItem("Init", ie.getId(), ie.getCount(), newChar, null); if (item == null) { - LOGGER.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); + PacketLogger.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); continue; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java index 86c425fa45..63c3261946 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Level; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.CharacterDeleteFailType; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -25,6 +23,7 @@ import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDelete; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteFail; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteSuccess; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -74,7 +73,7 @@ public class CharacterDelete implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Error:", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1, 0); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java index 5f74c38273..cfe9b20f3d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java @@ -47,7 +47,7 @@ public class EndScenePlayer implements IClientIncomingPacket final MovieHolder holder = player.getMovieHolder(); if ((holder == null) || (holder.getMovie().getClientId() != _movieId)) { - // LOGGER.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); + // PacketLogger.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 6ec1de19fd..6c7ce742c3 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -68,6 +68,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.Die; @@ -153,7 +154,7 @@ public class EnterWorld implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.warning("EnterWorld failed! player returned 'null'."); + PacketLogger.warning("EnterWorld failed! player returned 'null'."); Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java index 8bde20da0a..14e8153478 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java @@ -25,9 +25,13 @@ import org.l2jmobius.gameserver.network.GameClient; */ public class ExGetOnAirShip implements IClientIncomingPacket { + @SuppressWarnings("unused") private int _x; + @SuppressWarnings("unused") private int _y; + @SuppressWarnings("unused") private int _z; + @SuppressWarnings("unused") private int _shipId; @Override @@ -43,9 +47,9 @@ public class ExGetOnAirShip implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("[T1:ExGetOnAirShip] x: " + _x); - LOGGER.info("[T1:ExGetOnAirShip] y: " + _y); - LOGGER.info("[T1:ExGetOnAirShip] z: " + _z); - LOGGER.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); + // PacketLogger.info("[T1:ExGetOnAirShip] x: " + _x); + // PacketLogger.info("[T1:ExGetOnAirShip] y: " + _y); + // PacketLogger.info("[T1:ExGetOnAirShip] z: " + _z); + // PacketLogger.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java index fcdd8335f4..4e91188f5c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java @@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Arrays; -import java.util.logging.Level; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: c dddd @@ -79,7 +79,7 @@ public class GameGuardReply implements IClientIncomingPacket } catch (NoSuchAlgorithmException e) { - LOGGER.log(Level.WARNING, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java index eddff9f891..62e69acd86 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.gameserver.network.GameClient; @@ -27,5 +25,4 @@ import org.l2jmobius.gameserver.network.GameClient; */ public interface IClientIncomingPacket extends IIncomingPacket { - Logger LOGGER = Logger.getLogger(IClientIncomingPacket.class.getName()); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 0d3203de73..6a26d8fec9 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -153,7 +154,7 @@ public class MultiSellChoose implements IClientIncomingPacket if (((_soulCrystalOptions != null) && CommonUtil.contains(_soulCrystalOptions, null)) || ((_soulCrystalSpecialOptions != null) && CommonUtil.contains(_soulCrystalSpecialOptions, null))) { - LOGGER.severe("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -161,14 +162,14 @@ public class MultiSellChoose implements IClientIncomingPacket final MultisellEntryHolder entry = list.getEntries().get(_entryId - 1); // Entry Id begins from 1. We currently use entry IDs as index pointer. if (entry == null) { - LOGGER.severe("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } if (!entry.isStackable() && (_amount > 1)) { - LOGGER.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -196,7 +197,7 @@ public class MultiSellChoose implements IClientIncomingPacket )) //@formatter:on { - LOGGER.severe("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -368,7 +369,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); return; } } @@ -478,7 +479,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); return; } } @@ -673,7 +674,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); + PacketLogger.warning("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); return false; } } 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 ca3bfa1d81..951d019212 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 @@ -45,6 +45,7 @@ import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillDone; import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; @@ -105,7 +106,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if ((_level < 1) || (_level > 1000) || (_id < 1) || (_id > 64000)) { Util.handleIllegalPlayerAction(player, "Wrong Packet Data in Aquired Skill", Config.DEFAULT_PUNISH); - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); return; } @@ -119,7 +120,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - LOGGER.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -500,7 +501,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket } default: { - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); break; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 0a570fd3ef..4bb789645a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillInfo; import org.l2jmobius.gameserver.network.serverpackets.ExAcquireSkillInfo; @@ -55,7 +56,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket { if ((_id <= 0) || (_level <= 0)) { - LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); return; } @@ -74,7 +75,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level); if (skill == null) { - LOGGER.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); + PacketLogger.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); return; } 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 5e0a2af0c9..8078d0c10e 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.Arrays; -import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.ActionData; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; @@ -41,8 +41,6 @@ import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList; */ public class RequestActionUse implements IClientIncomingPacket { - private static final Logger LOGGER = Logger.getLogger(RequestActionUse.class.getName()); - private int _actionId; private boolean _ctrlPressed; private boolean _shiftPressed; @@ -93,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } @@ -107,7 +105,7 @@ public class RequestActionUse implements IClientIncomingPacket actionHandler.useAction(player, actionHolder, _ctrlPressed, _shiftPressed); return; } - LOGGER.warning("Couldnt find handler with name: " + actionHolder.getHandler()); + PacketLogger.warning("Couldn't find handler with name: " + actionHolder.getHandler()); return; } @@ -143,7 +141,7 @@ public class RequestActionUse implements IClientIncomingPacket } default: { - LOGGER.warning(player.getName() + ": unhandled action type " + _actionId); + PacketLogger.warning(player.getName() + ": unhandled action type " + _actionId); break; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java index 1fa1214bea..76649875f1 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.data.xml.FakePlayerData; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -130,7 +131,7 @@ public class RequestBlock implements IClientIncomingPacket } default: { - LOGGER.info("Unknown 0xA9 block type: " + _type); + PacketLogger.info("Unknown 0xA9 block type: " + _type); } } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index 2619da4b24..803dbd3fa6 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -161,7 +162,7 @@ public class RequestBuyItem implements IClientIncomingPacket long price = product.getPrice(); if (price < 0) { - LOGGER.warning("ERROR, no price found .. wrong buylist ??"); + PacketLogger.warning("ERROR, no price found .. wrong buylist ??"); client.sendPacket(ActionFailed.STATIC_PACKET); 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 47214311ac..4d8e55bc8e 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.StringTokenizer; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -43,6 +42,7 @@ import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -90,7 +90,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -194,7 +194,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (NumberFormatException nfe) { - LOGGER.log(Level.WARNING, "NFE for command [" + _command + "]", nfe); + PacketLogger.warning("NFE for command [" + _command + "] " + nfe.getMessage()); } } else if (_command.startsWith("_match")) @@ -295,13 +295,13 @@ public class RequestBypassToServer implements IClientIncomingPacket } else { - LOGGER.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); + PacketLogger.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); } } } catch (Exception e) { - LOGGER.log(Level.WARNING, "Exception processing bypass from player " + player.getName() + ": " + _command, e); + PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _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/RequestCrystallizeItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index af45d9defb..03d610fe78 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -59,7 +60,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.finer("RequestCrystalizeItem: activeChar was null"); + // PacketLogger.finer("RequestCrystalizeItem: activeChar was null."); return; } @@ -87,7 +88,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - LOGGER.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index c67449efed..71bb657bf9 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; @@ -33,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -169,7 +169,7 @@ public class RequestDestroyItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not delete pet objectid: ", e); + PacketLogger.warning("Could not delete pet objectid: " + e.getMessage()); } } if (itemToRemove.isTimeLimitedItem()) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 35f1f3c33e..5b6fea109a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.GMAudit; import org.l2jmobius.gameserver.util.Util; @@ -210,7 +211,7 @@ public class RequestDropItem implements IClientIncomingPacket if ((dropedItem != null) && (dropedItem.getId() == Inventory.ADENA_ID) && (dropedItem.getCount() >= 1000000)) { final String msg = "Character (" + player.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")"; - LOGGER.warning(msg); + PacketLogger.warning(msg); AdminData.getInstance().broadcastMessageToGMs(msg); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java index e3ab837779..e8bfc249c9 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ExNeedToChangeName; /** @@ -42,6 +43,6 @@ public class RequestExChangeName implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); + PacketLogger.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java index 6e4861568e..c2f02f89ad 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chdd d: Arena d: Team @@ -74,7 +75,7 @@ public class RequestExCubeGameChangeTeam implements IClientIncomingPacket } default: { - LOGGER.warning("Wrong Cube Game Team ID: " + _team); + PacketLogger.warning("Wrong Cube Game Team ID: " + _team); break; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java index 009b836b6d..d72fdfc413 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chddd d: Arena d: Answer @@ -64,7 +65,7 @@ public class RequestExCubeGameReadyAnswer implements IClientIncomingPacket } default: { - LOGGER.warning("Unknown Cube Game Answer ID: " + _answer); + PacketLogger.warning("Unknown Cube Game Answer ID: " + _answer); break; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java index ff12adb20d..3347f01941 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) just a trigger @@ -34,6 +35,6 @@ public class RequestExFishRanking implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestExFishRanking"); + PacketLogger.info("C5: RequestExFishRanking"); } } \ No newline at end of file diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 57e8e7d2e5..8851aef463 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; import org.l2jmobius.gameserver.util.Broadcast; @@ -86,7 +87,7 @@ public class RequestExMagicSkillUseGround implements IClientIncomingPacket else { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("No skill found with id " + _skillId + " and level " + level + " !!"); + PacketLogger.warning("No skill found with id " + _skillId + " and level " + level + " !!"); } } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 77093c5f2d..2d9f0456f4 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; @@ -73,7 +74,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket client.sendPacket(new ExPutEnchantTargetItemResult(0)); if (scrollTemplate == null) { - LOGGER.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); + PacketLogger.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); } return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java index 05e09e6dfc..0a4522bf64 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressMapInfo; @@ -43,7 +44,7 @@ public class RequestFortressMapInfo implements IClientIncomingPacket final Fort fort = FortManager.getInstance().getFortById(_fortressId); if (fort == null) { - LOGGER.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); + PacketLogger.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); if (client.getPlayer() == null) { 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 f65a63d325..dc903790d0 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 @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) d @@ -44,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - LOGGER.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning("Player " + 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/RequestGetItemFromPet.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index 2330851024..fc913f182b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.util.Util; /** @@ -78,7 +79,7 @@ public class RequestGetItemFromPet implements IClientIncomingPacket if (pet.transferItem("Transfer", _objectId, _amount, player.getInventory(), player, pet) == null) { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 66fb839f0e..81d0ee6d55 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; @@ -118,7 +119,7 @@ public class RequestGiveItemToPet implements IClientIncomingPacket if (player.transferItem("Transfer", _objectId, _amount, pet.getInventory(), pet) == null) { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } 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 eab1e325f5..04b9115f3d 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 @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaEquipList; @@ -60,7 +61,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.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 fa21b68043..a7c019d65d 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; @@ -52,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - LOGGER.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); } client.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 b943775334..ff96a400c9 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; @@ -50,10 +51,11 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.sendPacket(ActionFailed.STATIC_PACKET); return; } + player.sendPacket(new HennaItemRemoveInfo(henna, player)); } } 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 70e2f43664..2e95a321ee 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -75,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); client.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 53f04488a6..ada67e190c 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -49,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - LOGGER.warning("Player " + actor.getName() + " sent empty html link!"); + PacketLogger.warning("Player " + actor.getName() + " sent empty html link!"); return; } if (_link.contains("..")) { - LOGGER.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); return; } final int htmlObjectId = actor.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - LOGGER.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java index 89adeae67b..2e1c1c83f6 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author UnAfraid @@ -51,7 +52,7 @@ public class RequestMagicSkillList implements IClientIncomingPacket if (player.getObjectId() != _objectId) { - LOGGER.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); + PacketLogger.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 9432941937..a228079092 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -64,7 +64,7 @@ public class RequestMagicSkillUse implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); // if (_magicId > 0) // { - // LOGGER.warning("Skill Id " + _magicId + " not found in player: " + player); + // PacketLogger.warning("Skill Id " + _magicId + " not found in player: " + player); // } return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 5fbcac0eca..9149ce1284 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListDelete; @@ -71,7 +72,7 @@ public class RequestOustPledgeMember implements IClientIncomingPacket final ClanMember member = clan.getClanMember(_target); if (member == null) { - LOGGER.warning("Target (" + _target + ") is not member of the clan"); + PacketLogger.warning("Target (" + _target + ") is not member of the clan"); return; } if (member.isOnline() && member.getPlayer().isInCombat()) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java index 9702554c3b..209835b319 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) S @@ -37,6 +38,6 @@ public class RequestPCCafeCouponUse implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestPCCafeCouponUse: S: " + _str); + PacketLogger.info("C5: RequestPCCafeCouponUse: S: " + _str); } } 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 e4376f9ad5..14eb0ff29b 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 @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -120,7 +121,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item item = player.checkItemManipulation(i.getId(), i.getCount(), "freight"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); warehouse.deleteMe(); return; } @@ -169,7 +170,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); warehouse.deleteMe(); return; } @@ -177,7 +178,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem("Trade", i.getId(), i.getCount(), warehouse, player, null); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 26cfaf9835..d8b2285a2d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -136,7 +137,7 @@ public class RequestPetUseItem implements IClientIncomingPacket else { player.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM); - LOGGER.warning("No item handler registered for itemId: " + item.getId()); + PacketLogger.warning("No item handler registered for itemId: " + item.getId()); } } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index 8ece2b3ec7..fec0dc36a0 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -25,6 +25,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Plim @@ -74,7 +75,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket } catch (SQLException e) { - LOGGER.severe("Error while saving petition feedback"); + PacketLogger.warning("Error while saving petition feedback."); } } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java index d212481717..3459b04c80 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java @@ -44,8 +44,8 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket @Override public void run(GameClient client) { - // LOGGER.info("C5: RequestPledgeMemberInfo d:"+_unk1); - // LOGGER.info("C5: RequestPledgeMemberInfo S:"+_player); + // PacketLogger.info("C5: RequestPledgeMemberInfo d:"+_unk1); + // PacketLogger.info("C5: RequestPledgeMemberInfo S:"+_player); final Player player = client.getPlayer(); if (player == null) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index e56c105cf4..44bbd9d34c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.HashMap; import java.util.Map; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -38,6 +37,7 @@ import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; @@ -74,7 +74,7 @@ public class RequestPreviewItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } @@ -152,7 +152,7 @@ public class RequestPreviewItem implements IClientIncomingPacket final Merchant merchant = (target instanceof Merchant) ? (Merchant) target : null; if (merchant == null) { - LOGGER.warning("Null merchant!"); + PacketLogger.warning(getClass().getSimpleName() + ": Null merchant!"); 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 251757c0ba..94958bc4fe 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.util.Util; @@ -145,7 +146,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if (result > 1) { - LOGGER.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); } return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java index 6892b2c4f6..f571151603 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; /** @@ -126,7 +127,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket if (!storeList.privateStoreSell(player, _items)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index a4010ca2cb..1632df189f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -193,7 +194,7 @@ public class RequestRefundItem implements IClientIncomingPacket final Item item = player.getRefund().transferItem("Refund", objectIds[i], Long.MAX_VALUE, player.getInventory(), player, player.getLastFolkNPC()); if (item == null) { - LOGGER.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index ee78579ea4..8a2f42272a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket { @@ -54,7 +55,7 @@ public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket } else { - LOGGER.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); + PacketLogger.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); } player.onTransactionRequest(requestor); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index afc4e65df4..08ad2c7763 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @version $Revision: 1.7.2.3.2.6 $ $Date: 2005/03/27 15:29:30 $ @@ -139,7 +140,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if ((player.getClan() == null) || (player.getClan().getHideoutId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.CLANHALL); @@ -167,7 +168,7 @@ public class RequestRestartPoint implements IClientIncomingPacket } else { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); return; } } @@ -199,7 +200,7 @@ public class RequestRestartPoint implements IClientIncomingPacket final Clan clan = player.getClan(); if ((clan == null) || (clan.getFortId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.FORTRESS); @@ -231,7 +232,7 @@ public class RequestRestartPoint implements IClientIncomingPacket if (((siegeClan == null) || siegeClan.getFlag().isEmpty())) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.SIEGEFLAG); @@ -241,7 +242,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if (!player.isGM() && !player.getInventory().haveItemForSelfResurrection()) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); return; } if (player.isGM() || player.destroyItemByItemId("Feather", 10649, 1, player, false) || player.destroyItemByItemId("Feather", 13300, 1, player, false) || player.destroyItemByItemId("Feather", 13128, 1, player, false)) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 33a10fd20c..5014c0b7d0 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExNoticePostSent; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -316,14 +317,14 @@ public class RequestSendPost implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getObjectId(), i.getCount(), "attach"); if ((oldItem == null) || !oldItem.isTradeable() || oldItem.isEquipped()) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); return false; } final Item newItem = player.getInventory().transferItem("SendMail", i.getObjectId(), i.getCount(), attachments, player, msg.getReceiverName() + "[" + msg.getReceiverId() + "]"); if (newItem == null) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java index 2a33016c9a..b5d130046c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -54,16 +55,16 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket final Castle castle = CastleManager.getInstance().getCastleById(_castleId); if ((player == null) || (castle == null)) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); return; } if ((castle.getOwnerId() > 0) && (castle.getOwnerId() != player.getClanId())) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); } else if (!player.isClanLeader()) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); } else if (!castle.isTimeRegistrationOver()) { @@ -79,12 +80,12 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); } } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); } } 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 6d1eea218a..c600906d81 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 @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; @@ -108,7 +109,7 @@ public class Say2 implements IClientIncomingPacket ChatType chatType = ChatType.findByClientId(_type); if (chatType == null) { - LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); + PacketLogger.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -116,7 +117,7 @@ public class Say2 implements IClientIncomingPacket if (_text.isEmpty()) { - LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); + PacketLogger.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -210,7 +211,7 @@ public class Say2 implements IClientIncomingPacket } else { - LOGGER.info("No handler registered for ChatType: " + _type + " Player: " + client); + PacketLogger.info("No handler registered for ChatType: " + _type + " Player: " + client); } } @@ -256,7 +257,7 @@ public class Say2 implements IClientIncomingPacket final Item item = owner.getInventory().getItemByObjectId(id); if (item == null) { - LOGGER.info(client + " trying publish item which doesnt own! ID:" + id); + PacketLogger.info(client + " trying publish item which doesnt own! ID:" + id); return false; } item.publish(); @@ -264,7 +265,7 @@ public class Say2 implements IClientIncomingPacket pos1 = _text.indexOf(8, pos) + 1; if (pos1 == 0) // missing ending tag { - LOGGER.info(client + " sent invalid publish item msg! ID:" + id); + PacketLogger.info(client + " sent invalid publish item msg! ID:" + id); return false; } } 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 ee93527570..7cdde1c7bb 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 @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -127,7 +128,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item item = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); return; } @@ -174,7 +175,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } @@ -186,7 +187,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem(warehouse.getName(), itemHolder.getId(), itemHolder.getCount(), warehouse, player, manager); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 3de872e222..54b59f3ea5 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; @@ -163,13 +164,13 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket final Item oldItem = warehouse.getItemByObjectId(i.getId()); if ((oldItem == null) || (oldItem.getCount() < i.getCount())) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } final Item newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, manager); if (newItem == null) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); return; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index b42c56a13c..cd4f0c7c64 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -43,6 +43,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUseSharedGroupItem; @@ -274,7 +275,7 @@ public class UseItem implements IClientIncomingPacket { if ((etcItem != null) && (etcItem.getHandlerName() != null)) { - LOGGER.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); + PacketLogger.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); } } else if (handler.useItem(player, item, _ctrlPressed)) 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 90ea3bae10..f39c34b91b 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -56,12 +57,12 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final SkillHolder holder = new SkillHolder(packet.readD(), packet.readD()); if (holder.getSkillLevel() < 1) { - LOGGER.warning("Player " + client + " is trying to learn skill " + holder + " by sending packet with level 0!"); + PacketLogger.warning("Player " + client + " is trying to learn skill " + holder + " by sending packet with level 0!"); return false; } if (_skills.putIfAbsent(holder.getSkillId(), holder) != null) { - LOGGER.warning("Player " + client + " is trying to send two times one skill " + holder + " to learn!"); + PacketLogger.warning("Player " + client + " is trying to send two times one skill " + holder + " to learn!"); return false; } } @@ -85,7 +86,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket if ((player.getAbilityPoints() == 0) || (player.getAbilityPoints() == player.getAbilityPointsUsed())) { - LOGGER.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); return; } @@ -114,7 +115,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final SkillLearn learn = SkillTreeData.getInstance().getAbilitySkill(holder.getSkillId(), holder.getSkillLevel()); if (learn == null) { - LOGGER.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); + PacketLogger.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); client.sendPacket(ActionFailed.STATIC_PACKET); break; } @@ -122,7 +123,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final Skill skill = holder.getSkill(); if (skill == null) { - LOGGER.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); + PacketLogger.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); client.sendPacket(ActionFailed.STATIC_PACKET); break; } @@ -155,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]) { - LOGGER.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!"); + PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -165,7 +166,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket { if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel()) { - LOGGER.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); + PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -174,7 +175,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 3 Learning a skill without having enough points if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points) { - LOGGER.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java index 964fffd4a3..348dc87199 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -98,13 +99,13 @@ public class RequestAlchemyConversion implements IClientIncomingPacket if (data == null) { player.sendPacket(new ExAlchemyConversion(0, 0)); - LOGGER.warning("Missing AlchemyData for skillId: " + _skillId + ", skillLevel: " + _skillLevel); + PacketLogger.warning("Missing AlchemyData for skillId: " + _skillId + ", skillLevel: " + _skillLevel); return; } // if (!_ingredients.equals(data.getIngredients())) // { - // LOGGER.warning("Client ingredients are not same as server ingredients for alchemy conversion player: "+ +"", player); + // PacketLogger.warning("Client ingredients are not same as server ingredients for alchemy conversion player: "+ +"", player); // return; // } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index 68da085e66..a36649b520 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -74,7 +75,7 @@ public class RequestAlchemyTryMixCube implements IClientIncomingPacket else // Player used packet injection tool. { final Player player = client.getPlayer(); - LOGGER.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName()); + PacketLogger.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName()); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return false; } 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 20d84a2bd6..6b2f96e87d 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; @@ -60,37 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - LOGGER.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 30% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 100% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - LOGGER.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - - LOGGER.warning("Player " + player + ": Auction House (15-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); return; - } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - LOGGER.warning("Player " + player + ": Auction House (30-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + 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/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index b4b5bd9011..e4e46a5271 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -94,7 +95,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning(player + ": tried to crystallize " + item.getItem()); + PacketLogger.warning(player + ": tried to crystallize " + item.getItem()); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index 8c7cd157a9..1e750add65 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList; @@ -61,7 +62,7 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { - LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); + PacketLogger.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index 6a17e5856a..1465b00631 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets.ensoul; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnsoulData; import org.l2jmobius.gameserver.enums.PrivateStoreType; @@ -28,6 +26,7 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -39,7 +38,6 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; */ public class RequestItemEnsoul implements IClientIncomingPacket { - private static final Logger LOGGER = Logger.getLogger(RequestItemEnsoul.class.getName()); private int _itemObjectId; private EnsoulItemOption[] _options; @@ -119,37 +117,37 @@ public class RequestItemEnsoul implements IClientIncomingPacket final Item item = player.getInventory().getItemByObjectId(_itemObjectId); if (item == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item without having it!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item without having it!"); return; } if (!item.isEquipable()) { - LOGGER.warning("Player: " + player + " attempting to ensoul non equippable item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul non equippable item: " + item + "!"); return; } if (!item.isWeapon()) { - LOGGER.warning("Player: " + player + " attempting to ensoul item that's not a weapon: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item that's not a weapon: " + item + "!"); return; } if (item.isCommonItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul common item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul common item: " + item + "!"); return; } if (item.isShadowItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul shadow item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul shadow item: " + item + "!"); return; } if (item.isHeroItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul hero item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul hero item: " + item + "!"); return; } if ((_options == null) || (_options.length == 0)) { - LOGGER.warning("Player: " + player + " attempting to ensoul item without any special ability declared!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item without any special ability declared!"); return; } @@ -173,14 +171,14 @@ public class RequestItemEnsoul implements IClientIncomingPacket if (!stone.getOptions().contains(itemOption.getSoulCrystalOption())) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that stone doesn't contains!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that stone doesn't contains!"); continue; } final EnsoulOption option = EnsoulData.getInstance().getOption(itemOption.getSoulCrystalOption()); if (option == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that doesn't exists!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that doesn't exists!"); continue; } @@ -205,13 +203,13 @@ public class RequestItemEnsoul implements IClientIncomingPacket } else { - LOGGER.warning("Player: " + player + " attempting to ensoul item option with unhandled type: " + itemOption.getType() + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option with unhandled type: " + itemOption.getType() + "!"); continue; } if (fee == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that doesn't exists! (unknown fee)"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that doesn't exists! (unknown fee)"); continue; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java index 3f29f579da..11b1da5ff3 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java @@ -18,12 +18,12 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -102,7 +102,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e); + PacketLogger.warning("Could not add friend objectid: " + e.getMessage()); } } else diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java index 99fc483839..01307e7a6d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -26,6 +25,7 @@ import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -99,7 +99,7 @@ public class RequestFriendDel implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not del friend objectid: ", e); + PacketLogger.warning("Could not del friend objectid: " + e.getMessage()); } } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index 8a327f1f9c..ff61b200fb 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.mentoring; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMenteeAdd; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -93,7 +93,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, e.getMessage(), e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java index 18445bd1c5..679dd76226 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.model.clan.ClanRewardBonus; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -77,7 +78,7 @@ public class RequestPledgeBonusReward implements IClientIncomingPacket } else { - LOGGER.warning(player + " Attempting to claim reward but clan(" + clan + ") doesn't have such!"); + PacketLogger.warning(player + " Attempting to claim reward but clan(" + clan + ") doesn't have such!"); } } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java index ee8910d06e..a53878b794 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductList; @@ -60,7 +61,7 @@ public class RequestBRProductList implements IClientIncomingPacket } default: { - LOGGER.warning(player + " send unhandled product list type: " + _type); + PacketLogger.warning(player + " send unhandled product list type: " + _type); break; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java index e83bf335a7..a828073bb9 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.SayuneRequest; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.type.SayuneZone; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; @@ -72,7 +73,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (zone.getMapId() == -1) { player.sendMessage("That zone is not supported yet!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); return; } @@ -80,7 +81,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (map == null) { player.sendMessage("This zone is not handled yet!!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); return; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java index f1ede4ef0a..41648f184f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Shuttle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -60,7 +61,7 @@ public class RequestShuttleGetOn implements IClientIncomingPacket player.getInVehiclePosition().setXYZ(_x, _y, _z); break; } - LOGGER.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); + PacketLogger.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); } } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 33eeff5060..1b8ddb2042 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -16,11 +16,10 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Level; - import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.util.Util; /** @@ -75,7 +74,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { if (html.length() > 17200) { - LOGGER.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable()); + PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } @@ -94,7 +93,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket if (content == null) { setHtml("My Text is missing:
" + path + ""); - LOGGER.warning("missing html page " + path); + PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index e6b4b8b604..57ed88ac29 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; /** @@ -46,7 +47,7 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index d94dbf4403..75f6596194 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Migi, DS @@ -44,7 +45,7 @@ public class ExReplySentPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index 7a9f6f7389..6ca5edc29b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author KenM @@ -54,7 +55,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); + PacketLogger.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); packet.writeS(""); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index b27eecaefa..650261e010 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IOutgoingPacket; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; @@ -28,8 +26,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; */ public interface IClientOutgoingPacket extends IOutgoingPacket { - Logger LOGGER = Logger.getLogger(IClientOutgoingPacket.class.getName()); - int[] PAPERDOLL_ORDER = new int[] { Inventory.PAPERDOLL_UNDER, diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 058e1d34b0..818c38a076 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan.SubPledge; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author -Wooden- @@ -56,7 +57,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket } else if (_clan.getClanMember(LeaderId) == null) { - LOGGER.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); + PacketLogger.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); return ""; } else diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index 2d436d0a58..59ec218c84 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.RecipeData; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class RecipeItemMakeInfo implements IClientOutgoingPacket { @@ -58,7 +59,8 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeQ(0x00); return true; } - LOGGER.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); + + PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 432ff8ad7f..0a3fe46cb7 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Shows the Siege Info
@@ -78,7 +79,7 @@ public class SiegeInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Null owner for castle: " + _castle.getName()); + PacketLogger.warning("Null owner for castle: " + _castle.getName()); } } else diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 90b90c68eb..f058ddf030 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; @@ -156,7 +157,7 @@ public class SystemMessage implements IClientOutgoingPacket // Mobius: With additional on-screen damage param (popup), length is increased. if (param.getType() != TYPE_POPUP_ID) { - LOGGER.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); + PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } @@ -407,7 +408,7 @@ public class SystemMessage implements IClientOutgoingPacket { if (param == null) { - LOGGER.warning("Found null parameter for SystemMessageId " + _smId); + PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 64fb395dda..6f57005e47 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -24,6 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class WareHouseWithdrawalList extends AbstractItemPacket { @@ -54,7 +55,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket _invSize = player.getInventory().getSize(); if (_player.getActiveWarehouse() == null) { - LOGGER.warning("error while sending withdraw request to: " + _player.getName()); + PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/PacketLogger.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/PacketLogger.java new file mode 100644 index 0000000000..5b5a083a99 --- /dev/null +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/PacketLogger.java @@ -0,0 +1,42 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.network; + +import java.util.logging.Logger; + +/** + * @author Mobius + */ +public class PacketLogger +{ + private static final Logger LOGGER = Logger.getLogger(PacketLogger.class.getName()); + + public static synchronized void warning(String message) + { + LOGGER.warning(message); + } + + public static synchronized void info(String message) + { + LOGGER.info(message); + } + + public static synchronized void finer(String message) + { + LOGGER.finer(message); + } +} diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 7c343f78be..ef3f4acc18 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -161,7 +162,7 @@ public class Action implements IClientIncomingPacket default: { // Invalid action detected (probably client cheating), log this - LOGGER.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); + PacketLogger.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); client.sendPacket(ActionFailed.STATIC_PACKET); break; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index db177c478d..922a088a0b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; import org.l2jmobius.gameserver.network.serverpackets.TradeOwnAdd; @@ -57,7 +58,7 @@ public class AddTradeItem implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - LOGGER.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); + PacketLogger.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); return; } @@ -67,7 +68,7 @@ public class AddTradeItem implements IClientIncomingPacket // Trade partner not found, cancel trade if (partner != null) { - LOGGER.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); + PacketLogger.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); } player.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE); player.cancelActiveTrade(); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 20134dd2bb..a3236b0d83 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -62,7 +62,7 @@ public class CannotMoveAnymore implements IClientIncomingPacket // player.stopMove(); // // if (Config.DEBUG) - // LOGGER.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ + // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); // StopMove smwl = new StopMove(player); // client.getPlayer().sendPacket(smwl); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 33a024f2cf..2f6dbdfee6 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -43,6 +43,7 @@ import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; import org.l2jmobius.gameserver.network.serverpackets.CharCreateOk; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -124,21 +125,21 @@ public class CharacterCreate implements IClientIncomingPacket if ((_face > 2) || (_face < 0)) { - LOGGER.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairStyle < 0) || ((_sex == 0) && (_hairStyle > 4)) || ((_sex != 0) && (_hairStyle > 6))) { - LOGGER.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairColor > 3) || (_hairColor < 0)) { - LOGGER.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } @@ -303,7 +304,7 @@ public class CharacterCreate implements IClientIncomingPacket final Item item = newChar.getInventory().addItem("Init", ie.getId(), ie.getCount(), newChar, null); if (item == null) { - LOGGER.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); + PacketLogger.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); continue; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java index 86c425fa45..63c3261946 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Level; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.CharacterDeleteFailType; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -25,6 +23,7 @@ import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDelete; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteFail; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteSuccess; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -74,7 +73,7 @@ public class CharacterDelete implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Error:", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1, 0); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java index 5f74c38273..cfe9b20f3d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java @@ -47,7 +47,7 @@ public class EndScenePlayer implements IClientIncomingPacket final MovieHolder holder = player.getMovieHolder(); if ((holder == null) || (holder.getMovie().getClientId() != _movieId)) { - // LOGGER.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); + // PacketLogger.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 6ec1de19fd..6c7ce742c3 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -68,6 +68,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.Die; @@ -153,7 +154,7 @@ public class EnterWorld implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.warning("EnterWorld failed! player returned 'null'."); + PacketLogger.warning("EnterWorld failed! player returned 'null'."); Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java index 8bde20da0a..14e8153478 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java @@ -25,9 +25,13 @@ import org.l2jmobius.gameserver.network.GameClient; */ public class ExGetOnAirShip implements IClientIncomingPacket { + @SuppressWarnings("unused") private int _x; + @SuppressWarnings("unused") private int _y; + @SuppressWarnings("unused") private int _z; + @SuppressWarnings("unused") private int _shipId; @Override @@ -43,9 +47,9 @@ public class ExGetOnAirShip implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("[T1:ExGetOnAirShip] x: " + _x); - LOGGER.info("[T1:ExGetOnAirShip] y: " + _y); - LOGGER.info("[T1:ExGetOnAirShip] z: " + _z); - LOGGER.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); + // PacketLogger.info("[T1:ExGetOnAirShip] x: " + _x); + // PacketLogger.info("[T1:ExGetOnAirShip] y: " + _y); + // PacketLogger.info("[T1:ExGetOnAirShip] z: " + _z); + // PacketLogger.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java index fcdd8335f4..4e91188f5c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java @@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Arrays; -import java.util.logging.Level; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: c dddd @@ -79,7 +79,7 @@ public class GameGuardReply implements IClientIncomingPacket } catch (NoSuchAlgorithmException e) { - LOGGER.log(Level.WARNING, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java index eddff9f891..62e69acd86 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.gameserver.network.GameClient; @@ -27,5 +25,4 @@ import org.l2jmobius.gameserver.network.GameClient; */ public interface IClientIncomingPacket extends IIncomingPacket { - Logger LOGGER = Logger.getLogger(IClientIncomingPacket.class.getName()); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 0d3203de73..6a26d8fec9 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -153,7 +154,7 @@ public class MultiSellChoose implements IClientIncomingPacket if (((_soulCrystalOptions != null) && CommonUtil.contains(_soulCrystalOptions, null)) || ((_soulCrystalSpecialOptions != null) && CommonUtil.contains(_soulCrystalSpecialOptions, null))) { - LOGGER.severe("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -161,14 +162,14 @@ public class MultiSellChoose implements IClientIncomingPacket final MultisellEntryHolder entry = list.getEntries().get(_entryId - 1); // Entry Id begins from 1. We currently use entry IDs as index pointer. if (entry == null) { - LOGGER.severe("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } if (!entry.isStackable() && (_amount > 1)) { - LOGGER.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -196,7 +197,7 @@ public class MultiSellChoose implements IClientIncomingPacket )) //@formatter:on { - LOGGER.severe("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -368,7 +369,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); return; } } @@ -478,7 +479,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); return; } } @@ -673,7 +674,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); + PacketLogger.warning("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); return false; } } 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 ca3bfa1d81..951d019212 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 @@ -45,6 +45,7 @@ import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillDone; import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; @@ -105,7 +106,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if ((_level < 1) || (_level > 1000) || (_id < 1) || (_id > 64000)) { Util.handleIllegalPlayerAction(player, "Wrong Packet Data in Aquired Skill", Config.DEFAULT_PUNISH); - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); return; } @@ -119,7 +120,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - LOGGER.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -500,7 +501,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket } default: { - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); break; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 0a570fd3ef..4bb789645a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillInfo; import org.l2jmobius.gameserver.network.serverpackets.ExAcquireSkillInfo; @@ -55,7 +56,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket { if ((_id <= 0) || (_level <= 0)) { - LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); return; } @@ -74,7 +75,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level); if (skill == null) { - LOGGER.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); + PacketLogger.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); return; } 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 5e0a2af0c9..8078d0c10e 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.Arrays; -import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.ActionData; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; @@ -41,8 +41,6 @@ import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList; */ public class RequestActionUse implements IClientIncomingPacket { - private static final Logger LOGGER = Logger.getLogger(RequestActionUse.class.getName()); - private int _actionId; private boolean _ctrlPressed; private boolean _shiftPressed; @@ -93,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } @@ -107,7 +105,7 @@ public class RequestActionUse implements IClientIncomingPacket actionHandler.useAction(player, actionHolder, _ctrlPressed, _shiftPressed); return; } - LOGGER.warning("Couldnt find handler with name: " + actionHolder.getHandler()); + PacketLogger.warning("Couldn't find handler with name: " + actionHolder.getHandler()); return; } @@ -143,7 +141,7 @@ public class RequestActionUse implements IClientIncomingPacket } default: { - LOGGER.warning(player.getName() + ": unhandled action type " + _actionId); + PacketLogger.warning(player.getName() + ": unhandled action type " + _actionId); break; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java index 1fa1214bea..76649875f1 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.data.xml.FakePlayerData; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -130,7 +131,7 @@ public class RequestBlock implements IClientIncomingPacket } default: { - LOGGER.info("Unknown 0xA9 block type: " + _type); + PacketLogger.info("Unknown 0xA9 block type: " + _type); } } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index e83f8665fd..106581d3f1 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -161,7 +162,7 @@ public class RequestBuyItem implements IClientIncomingPacket long price = product.getPrice(); if (price < 0) { - LOGGER.warning("ERROR, no price found .. wrong buylist ??"); + PacketLogger.warning("ERROR, no price found .. wrong buylist ??"); client.sendPacket(ActionFailed.STATIC_PACKET); 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 47214311ac..4d8e55bc8e 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.StringTokenizer; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -43,6 +42,7 @@ import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -90,7 +90,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -194,7 +194,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (NumberFormatException nfe) { - LOGGER.log(Level.WARNING, "NFE for command [" + _command + "]", nfe); + PacketLogger.warning("NFE for command [" + _command + "] " + nfe.getMessage()); } } else if (_command.startsWith("_match")) @@ -295,13 +295,13 @@ public class RequestBypassToServer implements IClientIncomingPacket } else { - LOGGER.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); + PacketLogger.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); } } } catch (Exception e) { - LOGGER.log(Level.WARNING, "Exception processing bypass from player " + player.getName() + ": " + _command, e); + PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _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/RequestCrystallizeItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index af45d9defb..03d610fe78 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -59,7 +60,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.finer("RequestCrystalizeItem: activeChar was null"); + // PacketLogger.finer("RequestCrystalizeItem: activeChar was null."); return; } @@ -87,7 +88,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - LOGGER.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index c67449efed..71bb657bf9 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; @@ -33,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -169,7 +169,7 @@ public class RequestDestroyItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not delete pet objectid: ", e); + PacketLogger.warning("Could not delete pet objectid: " + e.getMessage()); } } if (itemToRemove.isTimeLimitedItem()) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 35f1f3c33e..5b6fea109a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.GMAudit; import org.l2jmobius.gameserver.util.Util; @@ -210,7 +211,7 @@ public class RequestDropItem implements IClientIncomingPacket if ((dropedItem != null) && (dropedItem.getId() == Inventory.ADENA_ID) && (dropedItem.getCount() >= 1000000)) { final String msg = "Character (" + player.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")"; - LOGGER.warning(msg); + PacketLogger.warning(msg); AdminData.getInstance().broadcastMessageToGMs(msg); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java index e3ab837779..e8bfc249c9 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ExNeedToChangeName; /** @@ -42,6 +43,6 @@ public class RequestExChangeName implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); + PacketLogger.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java index 6e4861568e..c2f02f89ad 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chdd d: Arena d: Team @@ -74,7 +75,7 @@ public class RequestExCubeGameChangeTeam implements IClientIncomingPacket } default: { - LOGGER.warning("Wrong Cube Game Team ID: " + _team); + PacketLogger.warning("Wrong Cube Game Team ID: " + _team); break; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java index 009b836b6d..d72fdfc413 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chddd d: Arena d: Answer @@ -64,7 +65,7 @@ public class RequestExCubeGameReadyAnswer implements IClientIncomingPacket } default: { - LOGGER.warning("Unknown Cube Game Answer ID: " + _answer); + PacketLogger.warning("Unknown Cube Game Answer ID: " + _answer); break; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java index ff12adb20d..3347f01941 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) just a trigger @@ -34,6 +35,6 @@ public class RequestExFishRanking implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestExFishRanking"); + PacketLogger.info("C5: RequestExFishRanking"); } } \ No newline at end of file diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 57e8e7d2e5..8851aef463 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; import org.l2jmobius.gameserver.util.Broadcast; @@ -86,7 +87,7 @@ public class RequestExMagicSkillUseGround implements IClientIncomingPacket else { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("No skill found with id " + _skillId + " and level " + level + " !!"); + PacketLogger.warning("No skill found with id " + _skillId + " and level " + level + " !!"); } } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 77093c5f2d..2d9f0456f4 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; @@ -73,7 +74,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket client.sendPacket(new ExPutEnchantTargetItemResult(0)); if (scrollTemplate == null) { - LOGGER.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); + PacketLogger.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); } return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java index 05e09e6dfc..0a4522bf64 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressMapInfo; @@ -43,7 +44,7 @@ public class RequestFortressMapInfo implements IClientIncomingPacket final Fort fort = FortManager.getInstance().getFortById(_fortressId); if (fort == null) { - LOGGER.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); + PacketLogger.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); if (client.getPlayer() == null) { 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 f65a63d325..dc903790d0 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 @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) d @@ -44,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - LOGGER.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning("Player " + 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/RequestGetItemFromPet.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index 2330851024..fc913f182b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.util.Util; /** @@ -78,7 +79,7 @@ public class RequestGetItemFromPet implements IClientIncomingPacket if (pet.transferItem("Transfer", _objectId, _amount, player.getInventory(), player, pet) == null) { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 66fb839f0e..81d0ee6d55 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; @@ -118,7 +119,7 @@ public class RequestGiveItemToPet implements IClientIncomingPacket if (player.transferItem("Transfer", _objectId, _amount, pet.getInventory(), pet) == null) { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } 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 eab1e325f5..04b9115f3d 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 @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaEquipList; @@ -60,7 +61,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.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 fa21b68043..a7c019d65d 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; @@ -52,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - LOGGER.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); } client.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 b943775334..ff96a400c9 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; @@ -50,10 +51,11 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.sendPacket(ActionFailed.STATIC_PACKET); return; } + player.sendPacket(new HennaItemRemoveInfo(henna, player)); } } 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 70e2f43664..2e95a321ee 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -75,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); client.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 53f04488a6..ada67e190c 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -49,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - LOGGER.warning("Player " + actor.getName() + " sent empty html link!"); + PacketLogger.warning("Player " + actor.getName() + " sent empty html link!"); return; } if (_link.contains("..")) { - LOGGER.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); return; } final int htmlObjectId = actor.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - LOGGER.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java index 89adeae67b..2e1c1c83f6 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author UnAfraid @@ -51,7 +52,7 @@ public class RequestMagicSkillList implements IClientIncomingPacket if (player.getObjectId() != _objectId) { - LOGGER.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); + PacketLogger.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 9432941937..a228079092 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -64,7 +64,7 @@ public class RequestMagicSkillUse implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); // if (_magicId > 0) // { - // LOGGER.warning("Skill Id " + _magicId + " not found in player: " + player); + // PacketLogger.warning("Skill Id " + _magicId + " not found in player: " + player); // } return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 5fbcac0eca..9149ce1284 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListDelete; @@ -71,7 +72,7 @@ public class RequestOustPledgeMember implements IClientIncomingPacket final ClanMember member = clan.getClanMember(_target); if (member == null) { - LOGGER.warning("Target (" + _target + ") is not member of the clan"); + PacketLogger.warning("Target (" + _target + ") is not member of the clan"); return; } if (member.isOnline() && member.getPlayer().isInCombat()) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java index 9702554c3b..209835b319 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) S @@ -37,6 +38,6 @@ public class RequestPCCafeCouponUse implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestPCCafeCouponUse: S: " + _str); + PacketLogger.info("C5: RequestPCCafeCouponUse: S: " + _str); } } 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 e4376f9ad5..14eb0ff29b 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 @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -120,7 +121,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item item = player.checkItemManipulation(i.getId(), i.getCount(), "freight"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); warehouse.deleteMe(); return; } @@ -169,7 +170,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); warehouse.deleteMe(); return; } @@ -177,7 +178,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem("Trade", i.getId(), i.getCount(), warehouse, player, null); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 26cfaf9835..d8b2285a2d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -136,7 +137,7 @@ public class RequestPetUseItem implements IClientIncomingPacket else { player.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM); - LOGGER.warning("No item handler registered for itemId: " + item.getId()); + PacketLogger.warning("No item handler registered for itemId: " + item.getId()); } } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index 8ece2b3ec7..fec0dc36a0 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -25,6 +25,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Plim @@ -74,7 +75,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket } catch (SQLException e) { - LOGGER.severe("Error while saving petition feedback"); + PacketLogger.warning("Error while saving petition feedback."); } } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java index d212481717..3459b04c80 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java @@ -44,8 +44,8 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket @Override public void run(GameClient client) { - // LOGGER.info("C5: RequestPledgeMemberInfo d:"+_unk1); - // LOGGER.info("C5: RequestPledgeMemberInfo S:"+_player); + // PacketLogger.info("C5: RequestPledgeMemberInfo d:"+_unk1); + // PacketLogger.info("C5: RequestPledgeMemberInfo S:"+_player); final Player player = client.getPlayer(); if (player == null) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index e56c105cf4..44bbd9d34c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.HashMap; import java.util.Map; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -38,6 +37,7 @@ import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; @@ -74,7 +74,7 @@ public class RequestPreviewItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } @@ -152,7 +152,7 @@ public class RequestPreviewItem implements IClientIncomingPacket final Merchant merchant = (target instanceof Merchant) ? (Merchant) target : null; if (merchant == null) { - LOGGER.warning("Null merchant!"); + PacketLogger.warning(getClass().getSimpleName() + ": Null merchant!"); 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 251757c0ba..94958bc4fe 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.util.Util; @@ -145,7 +146,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if (result > 1) { - LOGGER.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); } return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java index 9998465898..8ab3d4962f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; public class RequestPrivateStoreSell implements IClientIncomingPacket @@ -134,7 +135,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket if (!storeList.privateStoreSell(player, _items)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index a4010ca2cb..1632df189f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -193,7 +194,7 @@ public class RequestRefundItem implements IClientIncomingPacket final Item item = player.getRefund().transferItem("Refund", objectIds[i], Long.MAX_VALUE, player.getInventory(), player, player.getLastFolkNPC()); if (item == null) { - LOGGER.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index ee78579ea4..8a2f42272a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket { @@ -54,7 +55,7 @@ public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket } else { - LOGGER.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); + PacketLogger.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); } player.onTransactionRequest(requestor); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index afc4e65df4..08ad2c7763 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @version $Revision: 1.7.2.3.2.6 $ $Date: 2005/03/27 15:29:30 $ @@ -139,7 +140,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if ((player.getClan() == null) || (player.getClan().getHideoutId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.CLANHALL); @@ -167,7 +168,7 @@ public class RequestRestartPoint implements IClientIncomingPacket } else { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); return; } } @@ -199,7 +200,7 @@ public class RequestRestartPoint implements IClientIncomingPacket final Clan clan = player.getClan(); if ((clan == null) || (clan.getFortId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.FORTRESS); @@ -231,7 +232,7 @@ public class RequestRestartPoint implements IClientIncomingPacket if (((siegeClan == null) || siegeClan.getFlag().isEmpty())) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.SIEGEFLAG); @@ -241,7 +242,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if (!player.isGM() && !player.getInventory().haveItemForSelfResurrection()) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); return; } if (player.isGM() || player.destroyItemByItemId("Feather", 10649, 1, player, false) || player.destroyItemByItemId("Feather", 13300, 1, player, false) || player.destroyItemByItemId("Feather", 13128, 1, player, false)) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 33a10fd20c..5014c0b7d0 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExNoticePostSent; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -316,14 +317,14 @@ public class RequestSendPost implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getObjectId(), i.getCount(), "attach"); if ((oldItem == null) || !oldItem.isTradeable() || oldItem.isEquipped()) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); return false; } final Item newItem = player.getInventory().transferItem("SendMail", i.getObjectId(), i.getCount(), attachments, player, msg.getReceiverName() + "[" + msg.getReceiverId() + "]"); if (newItem == null) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java index 2a33016c9a..b5d130046c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -54,16 +55,16 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket final Castle castle = CastleManager.getInstance().getCastleById(_castleId); if ((player == null) || (castle == null)) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); return; } if ((castle.getOwnerId() > 0) && (castle.getOwnerId() != player.getClanId())) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); } else if (!player.isClanLeader()) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); } else if (!castle.isTimeRegistrationOver()) { @@ -79,12 +80,12 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); } } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); } } 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 19a6780f98..04f5293545 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 @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; @@ -108,7 +109,7 @@ public class Say2 implements IClientIncomingPacket ChatType chatType = ChatType.findByClientId(_type); if (chatType == null) { - LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); + PacketLogger.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -116,7 +117,7 @@ public class Say2 implements IClientIncomingPacket if (_text.isEmpty()) { - LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); + PacketLogger.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -210,7 +211,7 @@ public class Say2 implements IClientIncomingPacket } else { - LOGGER.info("No handler registered for ChatType: " + _type + " Player: " + client); + PacketLogger.info("No handler registered for ChatType: " + _type + " Player: " + client); } } @@ -256,7 +257,7 @@ public class Say2 implements IClientIncomingPacket final Item item = owner.getInventory().getItemByObjectId(id); if (item == null) { - LOGGER.info(client + " trying publish item which doesnt own! ID:" + id); + PacketLogger.info(client + " trying publish item which doesnt own! ID:" + id); return false; } item.publish(); @@ -264,7 +265,7 @@ public class Say2 implements IClientIncomingPacket pos1 = _text.indexOf(8, pos) + 1; if (pos1 == 0) // missing ending tag { - LOGGER.info(client + " sent invalid publish item msg! ID:" + id); + PacketLogger.info(client + " sent invalid publish item msg! ID:" + id); return false; } } 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 ee93527570..7cdde1c7bb 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 @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -127,7 +128,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item item = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); return; } @@ -174,7 +175,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } @@ -186,7 +187,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem(warehouse.getName(), itemHolder.getId(), itemHolder.getCount(), warehouse, player, manager); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 3de872e222..54b59f3ea5 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; @@ -163,13 +164,13 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket final Item oldItem = warehouse.getItemByObjectId(i.getId()); if ((oldItem == null) || (oldItem.getCount() < i.getCount())) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } final Item newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, manager); if (newItem == null) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); return; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index b42c56a13c..cd4f0c7c64 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -43,6 +43,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUseSharedGroupItem; @@ -274,7 +275,7 @@ public class UseItem implements IClientIncomingPacket { if ((etcItem != null) && (etcItem.getHandlerName() != null)) { - LOGGER.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); + PacketLogger.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); } } else if (handler.useItem(player, item, _ctrlPressed)) 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 90ea3bae10..f39c34b91b 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -56,12 +57,12 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final SkillHolder holder = new SkillHolder(packet.readD(), packet.readD()); if (holder.getSkillLevel() < 1) { - LOGGER.warning("Player " + client + " is trying to learn skill " + holder + " by sending packet with level 0!"); + PacketLogger.warning("Player " + client + " is trying to learn skill " + holder + " by sending packet with level 0!"); return false; } if (_skills.putIfAbsent(holder.getSkillId(), holder) != null) { - LOGGER.warning("Player " + client + " is trying to send two times one skill " + holder + " to learn!"); + PacketLogger.warning("Player " + client + " is trying to send two times one skill " + holder + " to learn!"); return false; } } @@ -85,7 +86,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket if ((player.getAbilityPoints() == 0) || (player.getAbilityPoints() == player.getAbilityPointsUsed())) { - LOGGER.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); return; } @@ -114,7 +115,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final SkillLearn learn = SkillTreeData.getInstance().getAbilitySkill(holder.getSkillId(), holder.getSkillLevel()); if (learn == null) { - LOGGER.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); + PacketLogger.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); client.sendPacket(ActionFailed.STATIC_PACKET); break; } @@ -122,7 +123,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final Skill skill = holder.getSkill(); if (skill == null) { - LOGGER.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); + PacketLogger.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); client.sendPacket(ActionFailed.STATIC_PACKET); break; } @@ -155,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]) { - LOGGER.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!"); + PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -165,7 +166,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket { if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel()) { - LOGGER.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); + PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -174,7 +175,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 3 Learning a skill without having enough points if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points) { - LOGGER.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java index 964fffd4a3..348dc87199 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -98,13 +99,13 @@ public class RequestAlchemyConversion implements IClientIncomingPacket if (data == null) { player.sendPacket(new ExAlchemyConversion(0, 0)); - LOGGER.warning("Missing AlchemyData for skillId: " + _skillId + ", skillLevel: " + _skillLevel); + PacketLogger.warning("Missing AlchemyData for skillId: " + _skillId + ", skillLevel: " + _skillLevel); return; } // if (!_ingredients.equals(data.getIngredients())) // { - // LOGGER.warning("Client ingredients are not same as server ingredients for alchemy conversion player: "+ +"", player); + // PacketLogger.warning("Client ingredients are not same as server ingredients for alchemy conversion player: "+ +"", player); // return; // } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index 68da085e66..a36649b520 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -74,7 +75,7 @@ public class RequestAlchemyTryMixCube implements IClientIncomingPacket else // Player used packet injection tool. { final Player player = client.getPlayer(); - LOGGER.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName()); + PacketLogger.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName()); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return false; } 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 20d84a2bd6..6b2f96e87d 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; @@ -60,37 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - LOGGER.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 30% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 100% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - LOGGER.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - - LOGGER.warning("Player " + player + ": Auction House (15-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); return; - } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - LOGGER.warning("Player " + player + ": Auction House (30-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + 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/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index b4b5bd9011..e4e46a5271 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -94,7 +95,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning(player + ": tried to crystallize " + item.getItem()); + PacketLogger.warning(player + ": tried to crystallize " + item.getItem()); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index 8c7cd157a9..1e750add65 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList; @@ -61,7 +62,7 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { - LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); + PacketLogger.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index 6a17e5856a..1465b00631 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets.ensoul; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnsoulData; import org.l2jmobius.gameserver.enums.PrivateStoreType; @@ -28,6 +26,7 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -39,7 +38,6 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; */ public class RequestItemEnsoul implements IClientIncomingPacket { - private static final Logger LOGGER = Logger.getLogger(RequestItemEnsoul.class.getName()); private int _itemObjectId; private EnsoulItemOption[] _options; @@ -119,37 +117,37 @@ public class RequestItemEnsoul implements IClientIncomingPacket final Item item = player.getInventory().getItemByObjectId(_itemObjectId); if (item == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item without having it!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item without having it!"); return; } if (!item.isEquipable()) { - LOGGER.warning("Player: " + player + " attempting to ensoul non equippable item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul non equippable item: " + item + "!"); return; } if (!item.isWeapon()) { - LOGGER.warning("Player: " + player + " attempting to ensoul item that's not a weapon: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item that's not a weapon: " + item + "!"); return; } if (item.isCommonItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul common item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul common item: " + item + "!"); return; } if (item.isShadowItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul shadow item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul shadow item: " + item + "!"); return; } if (item.isHeroItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul hero item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul hero item: " + item + "!"); return; } if ((_options == null) || (_options.length == 0)) { - LOGGER.warning("Player: " + player + " attempting to ensoul item without any special ability declared!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item without any special ability declared!"); return; } @@ -173,14 +171,14 @@ public class RequestItemEnsoul implements IClientIncomingPacket if (!stone.getOptions().contains(itemOption.getSoulCrystalOption())) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that stone doesn't contains!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that stone doesn't contains!"); continue; } final EnsoulOption option = EnsoulData.getInstance().getOption(itemOption.getSoulCrystalOption()); if (option == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that doesn't exists!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that doesn't exists!"); continue; } @@ -205,13 +203,13 @@ public class RequestItemEnsoul implements IClientIncomingPacket } else { - LOGGER.warning("Player: " + player + " attempting to ensoul item option with unhandled type: " + itemOption.getType() + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option with unhandled type: " + itemOption.getType() + "!"); continue; } if (fee == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that doesn't exists! (unknown fee)"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that doesn't exists! (unknown fee)"); continue; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java index 3f29f579da..11b1da5ff3 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java @@ -18,12 +18,12 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -102,7 +102,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e); + PacketLogger.warning("Could not add friend objectid: " + e.getMessage()); } } else diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java index 99fc483839..01307e7a6d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -26,6 +25,7 @@ import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -99,7 +99,7 @@ public class RequestFriendDel implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not del friend objectid: ", e); + PacketLogger.warning("Could not del friend objectid: " + e.getMessage()); } } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index 8a327f1f9c..ff61b200fb 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.mentoring; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMenteeAdd; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -93,7 +93,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, e.getMessage(), e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java index 18445bd1c5..679dd76226 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.model.clan.ClanRewardBonus; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -77,7 +78,7 @@ public class RequestPledgeBonusReward implements IClientIncomingPacket } else { - LOGGER.warning(player + " Attempting to claim reward but clan(" + clan + ") doesn't have such!"); + PacketLogger.warning(player + " Attempting to claim reward but clan(" + clan + ") doesn't have such!"); } } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java index ee8910d06e..a53878b794 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductList; @@ -60,7 +61,7 @@ public class RequestBRProductList implements IClientIncomingPacket } default: { - LOGGER.warning(player + " send unhandled product list type: " + _type); + PacketLogger.warning(player + " send unhandled product list type: " + _type); break; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java index e83bf335a7..a828073bb9 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.SayuneRequest; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.type.SayuneZone; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; @@ -72,7 +73,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (zone.getMapId() == -1) { player.sendMessage("That zone is not supported yet!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); return; } @@ -80,7 +81,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (map == null) { player.sendMessage("This zone is not handled yet!!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); return; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java index f1ede4ef0a..41648f184f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Shuttle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -60,7 +61,7 @@ public class RequestShuttleGetOn implements IClientIncomingPacket player.getInVehiclePosition().setXYZ(_x, _y, _z); break; } - LOGGER.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); + PacketLogger.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); } } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 33eeff5060..1b8ddb2042 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -16,11 +16,10 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Level; - import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.util.Util; /** @@ -75,7 +74,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { if (html.length() > 17200) { - LOGGER.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable()); + PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } @@ -94,7 +93,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket if (content == null) { setHtml("My Text is missing:
" + path + ""); - LOGGER.warning("missing html page " + path); + PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index e6b4b8b604..57ed88ac29 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; /** @@ -46,7 +47,7 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index d94dbf4403..75f6596194 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Migi, DS @@ -44,7 +45,7 @@ public class ExReplySentPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index 7a9f6f7389..6ca5edc29b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author KenM @@ -54,7 +55,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); + PacketLogger.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); packet.writeS(""); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index b27eecaefa..650261e010 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IOutgoingPacket; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; @@ -28,8 +26,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; */ public interface IClientOutgoingPacket extends IOutgoingPacket { - Logger LOGGER = Logger.getLogger(IClientOutgoingPacket.class.getName()); - int[] PAPERDOLL_ORDER = new int[] { Inventory.PAPERDOLL_UNDER, diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 058e1d34b0..818c38a076 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan.SubPledge; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author -Wooden- @@ -56,7 +57,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket } else if (_clan.getClanMember(LeaderId) == null) { - LOGGER.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); + PacketLogger.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); return ""; } else diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index 2d436d0a58..59ec218c84 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.RecipeData; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class RecipeItemMakeInfo implements IClientOutgoingPacket { @@ -58,7 +59,8 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeQ(0x00); return true; } - LOGGER.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); + + PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 432ff8ad7f..0a3fe46cb7 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Shows the Siege Info
@@ -78,7 +79,7 @@ public class SiegeInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Null owner for castle: " + _castle.getName()); + PacketLogger.warning("Null owner for castle: " + _castle.getName()); } } else diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 44f290e92f..746b2da3f7 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; @@ -157,7 +158,7 @@ public class SystemMessage implements IClientOutgoingPacket // Mobius: With additional on-screen damage param (popup), length is increased. if (param.getType() != TYPE_POPUP_ID) { - LOGGER.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); + PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } @@ -414,7 +415,7 @@ public class SystemMessage implements IClientOutgoingPacket { if (param == null) { - LOGGER.warning("Found null parameter for SystemMessageId " + _smId); + PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 64fb395dda..6f57005e47 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -24,6 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class WareHouseWithdrawalList extends AbstractItemPacket { @@ -54,7 +55,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket _invSize = player.getInventory().getSize(); if (_player.getActiveWarehouse() == null) { - LOGGER.warning("error while sending withdraw request to: " + _player.getName()); + PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/PacketLogger.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/PacketLogger.java new file mode 100644 index 0000000000..5b5a083a99 --- /dev/null +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/PacketLogger.java @@ -0,0 +1,42 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.network; + +import java.util.logging.Logger; + +/** + * @author Mobius + */ +public class PacketLogger +{ + private static final Logger LOGGER = Logger.getLogger(PacketLogger.class.getName()); + + public static synchronized void warning(String message) + { + LOGGER.warning(message); + } + + public static synchronized void info(String message) + { + LOGGER.info(message); + } + + public static synchronized void finer(String message) + { + LOGGER.finer(message); + } +} diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 7c343f78be..ef3f4acc18 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -161,7 +162,7 @@ public class Action implements IClientIncomingPacket default: { // Invalid action detected (probably client cheating), log this - LOGGER.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); + PacketLogger.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); client.sendPacket(ActionFailed.STATIC_PACKET); break; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index db177c478d..922a088a0b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; import org.l2jmobius.gameserver.network.serverpackets.TradeOwnAdd; @@ -57,7 +58,7 @@ public class AddTradeItem implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - LOGGER.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); + PacketLogger.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); return; } @@ -67,7 +68,7 @@ public class AddTradeItem implements IClientIncomingPacket // Trade partner not found, cancel trade if (partner != null) { - LOGGER.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); + PacketLogger.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); } player.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE); player.cancelActiveTrade(); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 20134dd2bb..a3236b0d83 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -62,7 +62,7 @@ public class CannotMoveAnymore implements IClientIncomingPacket // player.stopMove(); // // if (Config.DEBUG) - // LOGGER.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ + // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); // StopMove smwl = new StopMove(player); // client.getPlayer().sendPacket(smwl); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 33a024f2cf..2f6dbdfee6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -43,6 +43,7 @@ import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; import org.l2jmobius.gameserver.network.serverpackets.CharCreateOk; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -124,21 +125,21 @@ public class CharacterCreate implements IClientIncomingPacket if ((_face > 2) || (_face < 0)) { - LOGGER.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairStyle < 0) || ((_sex == 0) && (_hairStyle > 4)) || ((_sex != 0) && (_hairStyle > 6))) { - LOGGER.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairColor > 3) || (_hairColor < 0)) { - LOGGER.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } @@ -303,7 +304,7 @@ public class CharacterCreate implements IClientIncomingPacket final Item item = newChar.getInventory().addItem("Init", ie.getId(), ie.getCount(), newChar, null); if (item == null) { - LOGGER.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); + PacketLogger.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); continue; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java index 86c425fa45..63c3261946 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Level; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.CharacterDeleteFailType; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -25,6 +23,7 @@ import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDelete; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteFail; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteSuccess; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -74,7 +73,7 @@ public class CharacterDelete implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Error:", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1, 0); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java index 5f74c38273..cfe9b20f3d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java @@ -47,7 +47,7 @@ public class EndScenePlayer implements IClientIncomingPacket final MovieHolder holder = player.getMovieHolder(); if ((holder == null) || (holder.getMovie().getClientId() != _movieId)) { - // LOGGER.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); + // PacketLogger.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index f2d00352fc..bfe7f5ff9d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -68,6 +68,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.Die; @@ -153,7 +154,7 @@ public class EnterWorld implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.warning("EnterWorld failed! player returned 'null'."); + PacketLogger.warning("EnterWorld failed! player returned 'null'."); Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java index 8bde20da0a..14e8153478 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java @@ -25,9 +25,13 @@ import org.l2jmobius.gameserver.network.GameClient; */ public class ExGetOnAirShip implements IClientIncomingPacket { + @SuppressWarnings("unused") private int _x; + @SuppressWarnings("unused") private int _y; + @SuppressWarnings("unused") private int _z; + @SuppressWarnings("unused") private int _shipId; @Override @@ -43,9 +47,9 @@ public class ExGetOnAirShip implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("[T1:ExGetOnAirShip] x: " + _x); - LOGGER.info("[T1:ExGetOnAirShip] y: " + _y); - LOGGER.info("[T1:ExGetOnAirShip] z: " + _z); - LOGGER.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); + // PacketLogger.info("[T1:ExGetOnAirShip] x: " + _x); + // PacketLogger.info("[T1:ExGetOnAirShip] y: " + _y); + // PacketLogger.info("[T1:ExGetOnAirShip] z: " + _z); + // PacketLogger.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java index fcdd8335f4..4e91188f5c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java @@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Arrays; -import java.util.logging.Level; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: c dddd @@ -79,7 +79,7 @@ public class GameGuardReply implements IClientIncomingPacket } catch (NoSuchAlgorithmException e) { - LOGGER.log(Level.WARNING, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java index eddff9f891..62e69acd86 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.gameserver.network.GameClient; @@ -27,5 +25,4 @@ import org.l2jmobius.gameserver.network.GameClient; */ public interface IClientIncomingPacket extends IIncomingPacket { - Logger LOGGER = Logger.getLogger(IClientIncomingPacket.class.getName()); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 0d3203de73..6a26d8fec9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -153,7 +154,7 @@ public class MultiSellChoose implements IClientIncomingPacket if (((_soulCrystalOptions != null) && CommonUtil.contains(_soulCrystalOptions, null)) || ((_soulCrystalSpecialOptions != null) && CommonUtil.contains(_soulCrystalSpecialOptions, null))) { - LOGGER.severe("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -161,14 +162,14 @@ public class MultiSellChoose implements IClientIncomingPacket final MultisellEntryHolder entry = list.getEntries().get(_entryId - 1); // Entry Id begins from 1. We currently use entry IDs as index pointer. if (entry == null) { - LOGGER.severe("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } if (!entry.isStackable() && (_amount > 1)) { - LOGGER.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -196,7 +197,7 @@ public class MultiSellChoose implements IClientIncomingPacket )) //@formatter:on { - LOGGER.severe("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -368,7 +369,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); return; } } @@ -478,7 +479,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); return; } } @@ -673,7 +674,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); + PacketLogger.warning("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); return false; } } 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 ca3bfa1d81..951d019212 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 @@ -45,6 +45,7 @@ import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillDone; import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; @@ -105,7 +106,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if ((_level < 1) || (_level > 1000) || (_id < 1) || (_id > 64000)) { Util.handleIllegalPlayerAction(player, "Wrong Packet Data in Aquired Skill", Config.DEFAULT_PUNISH); - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); return; } @@ -119,7 +120,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - LOGGER.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -500,7 +501,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket } default: { - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); break; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 0a570fd3ef..4bb789645a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillInfo; import org.l2jmobius.gameserver.network.serverpackets.ExAcquireSkillInfo; @@ -55,7 +56,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket { if ((_id <= 0) || (_level <= 0)) { - LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); return; } @@ -74,7 +75,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level); if (skill == null) { - LOGGER.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); + PacketLogger.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); return; } 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 5e0a2af0c9..8078d0c10e 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.Arrays; -import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.ActionData; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; @@ -41,8 +41,6 @@ import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList; */ public class RequestActionUse implements IClientIncomingPacket { - private static final Logger LOGGER = Logger.getLogger(RequestActionUse.class.getName()); - private int _actionId; private boolean _ctrlPressed; private boolean _shiftPressed; @@ -93,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } @@ -107,7 +105,7 @@ public class RequestActionUse implements IClientIncomingPacket actionHandler.useAction(player, actionHolder, _ctrlPressed, _shiftPressed); return; } - LOGGER.warning("Couldnt find handler with name: " + actionHolder.getHandler()); + PacketLogger.warning("Couldn't find handler with name: " + actionHolder.getHandler()); return; } @@ -143,7 +141,7 @@ public class RequestActionUse implements IClientIncomingPacket } default: { - LOGGER.warning(player.getName() + ": unhandled action type " + _actionId); + PacketLogger.warning(player.getName() + ": unhandled action type " + _actionId); break; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java index 1fa1214bea..76649875f1 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.data.xml.FakePlayerData; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -130,7 +131,7 @@ public class RequestBlock implements IClientIncomingPacket } default: { - LOGGER.info("Unknown 0xA9 block type: " + _type); + PacketLogger.info("Unknown 0xA9 block type: " + _type); } } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index e83f8665fd..106581d3f1 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -161,7 +162,7 @@ public class RequestBuyItem implements IClientIncomingPacket long price = product.getPrice(); if (price < 0) { - LOGGER.warning("ERROR, no price found .. wrong buylist ??"); + PacketLogger.warning("ERROR, no price found .. wrong buylist ??"); client.sendPacket(ActionFailed.STATIC_PACKET); 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 47214311ac..4d8e55bc8e 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.StringTokenizer; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -43,6 +42,7 @@ import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -90,7 +90,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -194,7 +194,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (NumberFormatException nfe) { - LOGGER.log(Level.WARNING, "NFE for command [" + _command + "]", nfe); + PacketLogger.warning("NFE for command [" + _command + "] " + nfe.getMessage()); } } else if (_command.startsWith("_match")) @@ -295,13 +295,13 @@ public class RequestBypassToServer implements IClientIncomingPacket } else { - LOGGER.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); + PacketLogger.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); } } } catch (Exception e) { - LOGGER.log(Level.WARNING, "Exception processing bypass from player " + player.getName() + ": " + _command, e); + PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _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/RequestCrystallizeItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index af45d9defb..03d610fe78 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -59,7 +60,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.finer("RequestCrystalizeItem: activeChar was null"); + // PacketLogger.finer("RequestCrystalizeItem: activeChar was null."); return; } @@ -87,7 +88,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - LOGGER.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index c67449efed..71bb657bf9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; @@ -33,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -169,7 +169,7 @@ public class RequestDestroyItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not delete pet objectid: ", e); + PacketLogger.warning("Could not delete pet objectid: " + e.getMessage()); } } if (itemToRemove.isTimeLimitedItem()) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 35f1f3c33e..5b6fea109a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.GMAudit; import org.l2jmobius.gameserver.util.Util; @@ -210,7 +211,7 @@ public class RequestDropItem implements IClientIncomingPacket if ((dropedItem != null) && (dropedItem.getId() == Inventory.ADENA_ID) && (dropedItem.getCount() >= 1000000)) { final String msg = "Character (" + player.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")"; - LOGGER.warning(msg); + PacketLogger.warning(msg); AdminData.getInstance().broadcastMessageToGMs(msg); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java index e3ab837779..e8bfc249c9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ExNeedToChangeName; /** @@ -42,6 +43,6 @@ public class RequestExChangeName implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); + PacketLogger.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java index 6e4861568e..c2f02f89ad 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chdd d: Arena d: Team @@ -74,7 +75,7 @@ public class RequestExCubeGameChangeTeam implements IClientIncomingPacket } default: { - LOGGER.warning("Wrong Cube Game Team ID: " + _team); + PacketLogger.warning("Wrong Cube Game Team ID: " + _team); break; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java index 009b836b6d..d72fdfc413 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chddd d: Arena d: Answer @@ -64,7 +65,7 @@ public class RequestExCubeGameReadyAnswer implements IClientIncomingPacket } default: { - LOGGER.warning("Unknown Cube Game Answer ID: " + _answer); + PacketLogger.warning("Unknown Cube Game Answer ID: " + _answer); break; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java index ff12adb20d..3347f01941 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) just a trigger @@ -34,6 +35,6 @@ public class RequestExFishRanking implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestExFishRanking"); + PacketLogger.info("C5: RequestExFishRanking"); } } \ No newline at end of file diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 57e8e7d2e5..8851aef463 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; import org.l2jmobius.gameserver.util.Broadcast; @@ -86,7 +87,7 @@ public class RequestExMagicSkillUseGround implements IClientIncomingPacket else { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("No skill found with id " + _skillId + " and level " + level + " !!"); + PacketLogger.warning("No skill found with id " + _skillId + " and level " + level + " !!"); } } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 77093c5f2d..2d9f0456f4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; @@ -73,7 +74,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket client.sendPacket(new ExPutEnchantTargetItemResult(0)); if (scrollTemplate == null) { - LOGGER.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); + PacketLogger.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); } return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java index 05e09e6dfc..0a4522bf64 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressMapInfo; @@ -43,7 +44,7 @@ public class RequestFortressMapInfo implements IClientIncomingPacket final Fort fort = FortManager.getInstance().getFortById(_fortressId); if (fort == null) { - LOGGER.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); + PacketLogger.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); if (client.getPlayer() == null) { 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 f65a63d325..dc903790d0 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 @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) d @@ -44,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - LOGGER.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning("Player " + 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/RequestGetItemFromPet.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index 2330851024..fc913f182b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.util.Util; /** @@ -78,7 +79,7 @@ public class RequestGetItemFromPet implements IClientIncomingPacket if (pet.transferItem("Transfer", _objectId, _amount, player.getInventory(), player, pet) == null) { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 66fb839f0e..81d0ee6d55 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; @@ -118,7 +119,7 @@ public class RequestGiveItemToPet implements IClientIncomingPacket if (player.transferItem("Transfer", _objectId, _amount, pet.getInventory(), pet) == null) { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } 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 eab1e325f5..04b9115f3d 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 @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaEquipList; @@ -60,7 +61,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.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 fa21b68043..a7c019d65d 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; @@ -52,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - LOGGER.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); } client.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 b943775334..ff96a400c9 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; @@ -50,10 +51,11 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.sendPacket(ActionFailed.STATIC_PACKET); return; } + player.sendPacket(new HennaItemRemoveInfo(henna, player)); } } 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 70e2f43664..2e95a321ee 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -75,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); client.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 53f04488a6..ada67e190c 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -49,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - LOGGER.warning("Player " + actor.getName() + " sent empty html link!"); + PacketLogger.warning("Player " + actor.getName() + " sent empty html link!"); return; } if (_link.contains("..")) { - LOGGER.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); return; } final int htmlObjectId = actor.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - LOGGER.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java index 89adeae67b..2e1c1c83f6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author UnAfraid @@ -51,7 +52,7 @@ public class RequestMagicSkillList implements IClientIncomingPacket if (player.getObjectId() != _objectId) { - LOGGER.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); + PacketLogger.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 9432941937..a228079092 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -64,7 +64,7 @@ public class RequestMagicSkillUse implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); // if (_magicId > 0) // { - // LOGGER.warning("Skill Id " + _magicId + " not found in player: " + player); + // PacketLogger.warning("Skill Id " + _magicId + " not found in player: " + player); // } return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 5fbcac0eca..9149ce1284 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListDelete; @@ -71,7 +72,7 @@ public class RequestOustPledgeMember implements IClientIncomingPacket final ClanMember member = clan.getClanMember(_target); if (member == null) { - LOGGER.warning("Target (" + _target + ") is not member of the clan"); + PacketLogger.warning("Target (" + _target + ") is not member of the clan"); return; } if (member.isOnline() && member.getPlayer().isInCombat()) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java index 9702554c3b..209835b319 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) S @@ -37,6 +38,6 @@ public class RequestPCCafeCouponUse implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestPCCafeCouponUse: S: " + _str); + PacketLogger.info("C5: RequestPCCafeCouponUse: S: " + _str); } } 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 e4376f9ad5..14eb0ff29b 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 @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -120,7 +121,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item item = player.checkItemManipulation(i.getId(), i.getCount(), "freight"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); warehouse.deleteMe(); return; } @@ -169,7 +170,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); warehouse.deleteMe(); return; } @@ -177,7 +178,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem("Trade", i.getId(), i.getCount(), warehouse, player, null); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 26cfaf9835..d8b2285a2d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -136,7 +137,7 @@ public class RequestPetUseItem implements IClientIncomingPacket else { player.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM); - LOGGER.warning("No item handler registered for itemId: " + item.getId()); + PacketLogger.warning("No item handler registered for itemId: " + item.getId()); } } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index 8ece2b3ec7..fec0dc36a0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -25,6 +25,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Plim @@ -74,7 +75,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket } catch (SQLException e) { - LOGGER.severe("Error while saving petition feedback"); + PacketLogger.warning("Error while saving petition feedback."); } } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java index d212481717..3459b04c80 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java @@ -44,8 +44,8 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket @Override public void run(GameClient client) { - // LOGGER.info("C5: RequestPledgeMemberInfo d:"+_unk1); - // LOGGER.info("C5: RequestPledgeMemberInfo S:"+_player); + // PacketLogger.info("C5: RequestPledgeMemberInfo d:"+_unk1); + // PacketLogger.info("C5: RequestPledgeMemberInfo S:"+_player); final Player player = client.getPlayer(); if (player == null) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index e56c105cf4..44bbd9d34c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.HashMap; import java.util.Map; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -38,6 +37,7 @@ import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; @@ -74,7 +74,7 @@ public class RequestPreviewItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } @@ -152,7 +152,7 @@ public class RequestPreviewItem implements IClientIncomingPacket final Merchant merchant = (target instanceof Merchant) ? (Merchant) target : null; if (merchant == null) { - LOGGER.warning("Null merchant!"); + PacketLogger.warning(getClass().getSimpleName() + ": Null merchant!"); 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 251757c0ba..94958bc4fe 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.util.Util; @@ -145,7 +146,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if (result > 1) { - LOGGER.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); } return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java index 9998465898..8ab3d4962f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; public class RequestPrivateStoreSell implements IClientIncomingPacket @@ -134,7 +135,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket if (!storeList.privateStoreSell(player, _items)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index a4010ca2cb..1632df189f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -193,7 +194,7 @@ public class RequestRefundItem implements IClientIncomingPacket final Item item = player.getRefund().transferItem("Refund", objectIds[i], Long.MAX_VALUE, player.getInventory(), player, player.getLastFolkNPC()); if (item == null) { - LOGGER.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index ee78579ea4..8a2f42272a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket { @@ -54,7 +55,7 @@ public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket } else { - LOGGER.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); + PacketLogger.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); } player.onTransactionRequest(requestor); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index afc4e65df4..08ad2c7763 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @version $Revision: 1.7.2.3.2.6 $ $Date: 2005/03/27 15:29:30 $ @@ -139,7 +140,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if ((player.getClan() == null) || (player.getClan().getHideoutId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.CLANHALL); @@ -167,7 +168,7 @@ public class RequestRestartPoint implements IClientIncomingPacket } else { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); return; } } @@ -199,7 +200,7 @@ public class RequestRestartPoint implements IClientIncomingPacket final Clan clan = player.getClan(); if ((clan == null) || (clan.getFortId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.FORTRESS); @@ -231,7 +232,7 @@ public class RequestRestartPoint implements IClientIncomingPacket if (((siegeClan == null) || siegeClan.getFlag().isEmpty())) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.SIEGEFLAG); @@ -241,7 +242,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if (!player.isGM() && !player.getInventory().haveItemForSelfResurrection()) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); return; } if (player.isGM() || player.destroyItemByItemId("Feather", 10649, 1, player, false) || player.destroyItemByItemId("Feather", 13300, 1, player, false) || player.destroyItemByItemId("Feather", 13128, 1, player, false)) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 33a10fd20c..5014c0b7d0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExNoticePostSent; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -316,14 +317,14 @@ public class RequestSendPost implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getObjectId(), i.getCount(), "attach"); if ((oldItem == null) || !oldItem.isTradeable() || oldItem.isEquipped()) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); return false; } final Item newItem = player.getInventory().transferItem("SendMail", i.getObjectId(), i.getCount(), attachments, player, msg.getReceiverName() + "[" + msg.getReceiverId() + "]"); if (newItem == null) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java index 2a33016c9a..b5d130046c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -54,16 +55,16 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket final Castle castle = CastleManager.getInstance().getCastleById(_castleId); if ((player == null) || (castle == null)) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); return; } if ((castle.getOwnerId() > 0) && (castle.getOwnerId() != player.getClanId())) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); } else if (!player.isClanLeader()) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); } else if (!castle.isTimeRegistrationOver()) { @@ -79,12 +80,12 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); } } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); } } 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 19a6780f98..04f5293545 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 @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; @@ -108,7 +109,7 @@ public class Say2 implements IClientIncomingPacket ChatType chatType = ChatType.findByClientId(_type); if (chatType == null) { - LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); + PacketLogger.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -116,7 +117,7 @@ public class Say2 implements IClientIncomingPacket if (_text.isEmpty()) { - LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); + PacketLogger.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -210,7 +211,7 @@ public class Say2 implements IClientIncomingPacket } else { - LOGGER.info("No handler registered for ChatType: " + _type + " Player: " + client); + PacketLogger.info("No handler registered for ChatType: " + _type + " Player: " + client); } } @@ -256,7 +257,7 @@ public class Say2 implements IClientIncomingPacket final Item item = owner.getInventory().getItemByObjectId(id); if (item == null) { - LOGGER.info(client + " trying publish item which doesnt own! ID:" + id); + PacketLogger.info(client + " trying publish item which doesnt own! ID:" + id); return false; } item.publish(); @@ -264,7 +265,7 @@ public class Say2 implements IClientIncomingPacket pos1 = _text.indexOf(8, pos) + 1; if (pos1 == 0) // missing ending tag { - LOGGER.info(client + " sent invalid publish item msg! ID:" + id); + PacketLogger.info(client + " sent invalid publish item msg! ID:" + id); return false; } } 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 ee93527570..7cdde1c7bb 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 @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -127,7 +128,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item item = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); return; } @@ -174,7 +175,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } @@ -186,7 +187,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem(warehouse.getName(), itemHolder.getId(), itemHolder.getCount(), warehouse, player, manager); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 3de872e222..54b59f3ea5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; @@ -163,13 +164,13 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket final Item oldItem = warehouse.getItemByObjectId(i.getId()); if ((oldItem == null) || (oldItem.getCount() < i.getCount())) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } final Item newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, manager); if (newItem == null) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); return; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index b42c56a13c..cd4f0c7c64 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -43,6 +43,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUseSharedGroupItem; @@ -274,7 +275,7 @@ public class UseItem implements IClientIncomingPacket { if ((etcItem != null) && (etcItem.getHandlerName() != null)) { - LOGGER.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); + PacketLogger.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); } } else if (handler.useItem(player, item, _ctrlPressed)) 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 36f9206cb0..ece66b1cd9 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -56,12 +57,12 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final SkillHolder holder = new SkillHolder(packet.readD(), packet.readD()); if (holder.getSkillLevel() < 1) { - LOGGER.warning("Player " + client + " is trying to learn skill " + holder + " by sending packet with level 0!"); + PacketLogger.warning("Player " + client + " is trying to learn skill " + holder + " by sending packet with level 0!"); return false; } if (_skills.putIfAbsent(holder.getSkillId(), holder) != null) { - LOGGER.warning("Player " + client + " is trying to send two times one skill " + holder + " to learn!"); + PacketLogger.warning("Player " + client + " is trying to send two times one skill " + holder + " to learn!"); return false; } } @@ -85,7 +86,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket if ((player.getAbilityPoints() == 0) || (player.getAbilityPoints() == player.getAbilityPointsUsed())) { - LOGGER.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); return; } @@ -114,7 +115,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final SkillLearn learn = SkillTreeData.getInstance().getAbilitySkill(holder.getSkillId(), holder.getSkillLevel()); if (learn == null) { - LOGGER.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); + PacketLogger.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); client.sendPacket(ActionFailed.STATIC_PACKET); break; } @@ -122,7 +123,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final Skill skill = holder.getSkill(); if (skill == null) { - LOGGER.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); + PacketLogger.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); client.sendPacket(ActionFailed.STATIC_PACKET); break; } @@ -155,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]) { - LOGGER.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!"); + PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -165,7 +166,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket { if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel()) { - LOGGER.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); + PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -174,7 +175,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 3 Learning a skill without having enough points if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points) { - LOGGER.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java index 964fffd4a3..348dc87199 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -98,13 +99,13 @@ public class RequestAlchemyConversion implements IClientIncomingPacket if (data == null) { player.sendPacket(new ExAlchemyConversion(0, 0)); - LOGGER.warning("Missing AlchemyData for skillId: " + _skillId + ", skillLevel: " + _skillLevel); + PacketLogger.warning("Missing AlchemyData for skillId: " + _skillId + ", skillLevel: " + _skillLevel); return; } // if (!_ingredients.equals(data.getIngredients())) // { - // LOGGER.warning("Client ingredients are not same as server ingredients for alchemy conversion player: "+ +"", player); + // PacketLogger.warning("Client ingredients are not same as server ingredients for alchemy conversion player: "+ +"", player); // return; // } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index 68da085e66..a36649b520 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -74,7 +75,7 @@ public class RequestAlchemyTryMixCube implements IClientIncomingPacket else // Player used packet injection tool. { final Player player = client.getPlayer(); - LOGGER.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName()); + PacketLogger.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName()); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return false; } 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 20d84a2bd6..6b2f96e87d 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; @@ -60,37 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - LOGGER.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 30% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 100% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - LOGGER.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - - LOGGER.warning("Player " + player + ": Auction House (15-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); return; - } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - LOGGER.warning("Player " + player + ": Auction House (30-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + 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/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index b4b5bd9011..e4e46a5271 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -94,7 +95,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning(player + ": tried to crystallize " + item.getItem()); + PacketLogger.warning(player + ": tried to crystallize " + item.getItem()); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index 999f5b7619..d8a8f85043 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward; @@ -62,7 +63,7 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { - LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); + PacketLogger.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index 6a17e5856a..1465b00631 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets.ensoul; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnsoulData; import org.l2jmobius.gameserver.enums.PrivateStoreType; @@ -28,6 +26,7 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -39,7 +38,6 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; */ public class RequestItemEnsoul implements IClientIncomingPacket { - private static final Logger LOGGER = Logger.getLogger(RequestItemEnsoul.class.getName()); private int _itemObjectId; private EnsoulItemOption[] _options; @@ -119,37 +117,37 @@ public class RequestItemEnsoul implements IClientIncomingPacket final Item item = player.getInventory().getItemByObjectId(_itemObjectId); if (item == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item without having it!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item without having it!"); return; } if (!item.isEquipable()) { - LOGGER.warning("Player: " + player + " attempting to ensoul non equippable item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul non equippable item: " + item + "!"); return; } if (!item.isWeapon()) { - LOGGER.warning("Player: " + player + " attempting to ensoul item that's not a weapon: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item that's not a weapon: " + item + "!"); return; } if (item.isCommonItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul common item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul common item: " + item + "!"); return; } if (item.isShadowItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul shadow item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul shadow item: " + item + "!"); return; } if (item.isHeroItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul hero item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul hero item: " + item + "!"); return; } if ((_options == null) || (_options.length == 0)) { - LOGGER.warning("Player: " + player + " attempting to ensoul item without any special ability declared!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item without any special ability declared!"); return; } @@ -173,14 +171,14 @@ public class RequestItemEnsoul implements IClientIncomingPacket if (!stone.getOptions().contains(itemOption.getSoulCrystalOption())) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that stone doesn't contains!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that stone doesn't contains!"); continue; } final EnsoulOption option = EnsoulData.getInstance().getOption(itemOption.getSoulCrystalOption()); if (option == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that doesn't exists!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that doesn't exists!"); continue; } @@ -205,13 +203,13 @@ public class RequestItemEnsoul implements IClientIncomingPacket } else { - LOGGER.warning("Player: " + player + " attempting to ensoul item option with unhandled type: " + itemOption.getType() + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option with unhandled type: " + itemOption.getType() + "!"); continue; } if (fee == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that doesn't exists! (unknown fee)"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that doesn't exists! (unknown fee)"); continue; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java index 3f29f579da..11b1da5ff3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java @@ -18,12 +18,12 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -102,7 +102,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e); + PacketLogger.warning("Could not add friend objectid: " + e.getMessage()); } } else diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java index 99fc483839..01307e7a6d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -26,6 +25,7 @@ import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -99,7 +99,7 @@ public class RequestFriendDel implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not del friend objectid: ", e); + PacketLogger.warning("Could not del friend objectid: " + e.getMessage()); } } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index 8a327f1f9c..ff61b200fb 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.mentoring; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMenteeAdd; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -93,7 +93,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, e.getMessage(), e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java index 18445bd1c5..679dd76226 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.model.clan.ClanRewardBonus; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -77,7 +78,7 @@ public class RequestPledgeBonusReward implements IClientIncomingPacket } else { - LOGGER.warning(player + " Attempting to claim reward but clan(" + clan + ") doesn't have such!"); + PacketLogger.warning(player + " Attempting to claim reward but clan(" + clan + ") doesn't have such!"); } } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java index ee8910d06e..a53878b794 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductList; @@ -60,7 +61,7 @@ public class RequestBRProductList implements IClientIncomingPacket } default: { - LOGGER.warning(player + " send unhandled product list type: " + _type); + PacketLogger.warning(player + " send unhandled product list type: " + _type); break; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java index e83bf335a7..a828073bb9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.SayuneRequest; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.type.SayuneZone; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; @@ -72,7 +73,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (zone.getMapId() == -1) { player.sendMessage("That zone is not supported yet!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); return; } @@ -80,7 +81,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (map == null) { player.sendMessage("This zone is not handled yet!!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); return; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java index f1ede4ef0a..41648f184f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Shuttle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -60,7 +61,7 @@ public class RequestShuttleGetOn implements IClientIncomingPacket player.getInVehiclePosition().setXYZ(_x, _y, _z); break; } - LOGGER.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); + PacketLogger.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); } } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 33eeff5060..1b8ddb2042 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -16,11 +16,10 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Level; - import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.util.Util; /** @@ -75,7 +74,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { if (html.length() > 17200) { - LOGGER.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable()); + PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } @@ -94,7 +93,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket if (content == null) { setHtml("My Text is missing:
" + path + ""); - LOGGER.warning("missing html page " + path); + PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index e6b4b8b604..57ed88ac29 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; /** @@ -46,7 +47,7 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index d94dbf4403..75f6596194 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Migi, DS @@ -44,7 +45,7 @@ public class ExReplySentPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index b0f3738683..15d011befc 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author KenM @@ -54,7 +55,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); + PacketLogger.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); packet.writeS(""); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index b27eecaefa..650261e010 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IOutgoingPacket; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; @@ -28,8 +26,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; */ public interface IClientOutgoingPacket extends IOutgoingPacket { - Logger LOGGER = Logger.getLogger(IClientOutgoingPacket.class.getName()); - int[] PAPERDOLL_ORDER = new int[] { Inventory.PAPERDOLL_UNDER, diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 058e1d34b0..818c38a076 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan.SubPledge; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author -Wooden- @@ -56,7 +57,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket } else if (_clan.getClanMember(LeaderId) == null) { - LOGGER.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); + PacketLogger.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); return ""; } else diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index a95e7ab97c..d9c2621c84 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.RecipeData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.RecipeHolder; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class RecipeItemMakeInfo implements IClientOutgoingPacket { @@ -77,7 +78,8 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeQ(_offeringMaximumAdena); // Adena worth of items for maximum offering. return true; } - LOGGER.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); + + PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 432ff8ad7f..0a3fe46cb7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Shows the Siege Info
@@ -78,7 +79,7 @@ public class SiegeInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Null owner for castle: " + _castle.getName()); + PacketLogger.warning("Null owner for castle: " + _castle.getName()); } } else diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 44f290e92f..746b2da3f7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; @@ -157,7 +158,7 @@ public class SystemMessage implements IClientOutgoingPacket // Mobius: With additional on-screen damage param (popup), length is increased. if (param.getType() != TYPE_POPUP_ID) { - LOGGER.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); + PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } @@ -414,7 +415,7 @@ public class SystemMessage implements IClientOutgoingPacket { if (param == null) { - LOGGER.warning("Found null parameter for SystemMessageId " + _smId); + PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 64fb395dda..6f57005e47 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -24,6 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class WareHouseWithdrawalList extends AbstractItemPacket { @@ -54,7 +55,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket _invSize = player.getInventory().getSize(); if (_player.getActiveWarehouse() == null) { - LOGGER.warning("error while sending withdraw request to: " + _player.getName()); + PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/PacketLogger.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/PacketLogger.java new file mode 100644 index 0000000000..5b5a083a99 --- /dev/null +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/PacketLogger.java @@ -0,0 +1,42 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.network; + +import java.util.logging.Logger; + +/** + * @author Mobius + */ +public class PacketLogger +{ + private static final Logger LOGGER = Logger.getLogger(PacketLogger.class.getName()); + + public static synchronized void warning(String message) + { + LOGGER.warning(message); + } + + public static synchronized void info(String message) + { + LOGGER.info(message); + } + + public static synchronized void finer(String message) + { + LOGGER.finer(message); + } +} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 7c343f78be..ef3f4acc18 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -161,7 +162,7 @@ public class Action implements IClientIncomingPacket default: { // Invalid action detected (probably client cheating), log this - LOGGER.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); + PacketLogger.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); client.sendPacket(ActionFailed.STATIC_PACKET); break; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index 31d29ef3dd..8e8ae2c190 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; import org.l2jmobius.gameserver.network.serverpackets.TradeOwnAdd; @@ -58,7 +59,7 @@ public class AddTradeItem implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - LOGGER.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); + PacketLogger.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); return; } @@ -68,7 +69,7 @@ public class AddTradeItem implements IClientIncomingPacket // Trade partner not found, cancel trade if (partner != null) { - LOGGER.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); + PacketLogger.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); } player.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE); player.cancelActiveTrade(); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 20134dd2bb..a3236b0d83 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -62,7 +62,7 @@ public class CannotMoveAnymore implements IClientIncomingPacket // player.stopMove(); // // if (Config.DEBUG) - // LOGGER.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ + // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); // StopMove smwl = new StopMove(player); // client.getPlayer().sendPacket(smwl); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 6b63144276..4350bab43a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -46,6 +46,7 @@ import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; import org.l2jmobius.gameserver.network.serverpackets.CharCreateOk; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -127,21 +128,21 @@ public class CharacterCreate implements IClientIncomingPacket if ((_face > 2) || (_face < 0)) { - LOGGER.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairStyle < 0) || ((_sex == 0) && (_hairStyle > 4)) || ((_sex != 0) && (_hairStyle > 6))) { - LOGGER.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairColor > 3) || (_hairColor < 0)) { - LOGGER.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } @@ -345,7 +346,7 @@ public class CharacterCreate implements IClientIncomingPacket final Item item = newChar.getInventory().addItem("Init", ie.getId(), ie.getCount(), newChar, null); if (item == null) { - LOGGER.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); + PacketLogger.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); continue; } @@ -362,7 +363,7 @@ public class CharacterCreate implements IClientIncomingPacket final Item item = newChar.getInventory().addItem("Balthus Rewards", reward.getId(), reward.getCount(), newChar, null); if (item == null) { - LOGGER.warning("Could not create item during char creation: itemId " + reward.getId() + ", amount " + reward.getCount() + "."); + PacketLogger.warning("Could not create item during char creation: itemId " + reward.getId() + ", amount " + reward.getCount() + "."); continue; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java index 86c425fa45..63c3261946 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Level; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.CharacterDeleteFailType; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -25,6 +23,7 @@ import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDelete; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteFail; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteSuccess; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -74,7 +73,7 @@ public class CharacterDelete implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Error:", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1, 0); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java index 5f74c38273..cfe9b20f3d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java @@ -47,7 +47,7 @@ public class EndScenePlayer implements IClientIncomingPacket final MovieHolder holder = player.getMovieHolder(); if ((holder == null) || (holder.getMovie().getClientId() != _movieId)) { - // LOGGER.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); + // PacketLogger.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index f1936451c8..ba43e72bfd 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -69,6 +69,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.Die; @@ -152,7 +153,7 @@ public class EnterWorld implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.warning("EnterWorld failed! player returned 'null'."); + PacketLogger.warning("EnterWorld failed! player returned 'null'."); Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java index 8bde20da0a..14e8153478 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java @@ -25,9 +25,13 @@ import org.l2jmobius.gameserver.network.GameClient; */ public class ExGetOnAirShip implements IClientIncomingPacket { + @SuppressWarnings("unused") private int _x; + @SuppressWarnings("unused") private int _y; + @SuppressWarnings("unused") private int _z; + @SuppressWarnings("unused") private int _shipId; @Override @@ -43,9 +47,9 @@ public class ExGetOnAirShip implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("[T1:ExGetOnAirShip] x: " + _x); - LOGGER.info("[T1:ExGetOnAirShip] y: " + _y); - LOGGER.info("[T1:ExGetOnAirShip] z: " + _z); - LOGGER.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); + // PacketLogger.info("[T1:ExGetOnAirShip] x: " + _x); + // PacketLogger.info("[T1:ExGetOnAirShip] y: " + _y); + // PacketLogger.info("[T1:ExGetOnAirShip] z: " + _z); + // PacketLogger.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java index fcdd8335f4..4e91188f5c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java @@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Arrays; -import java.util.logging.Level; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: c dddd @@ -79,7 +79,7 @@ public class GameGuardReply implements IClientIncomingPacket } catch (NoSuchAlgorithmException e) { - LOGGER.log(Level.WARNING, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java index eddff9f891..62e69acd86 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.gameserver.network.GameClient; @@ -27,5 +25,4 @@ import org.l2jmobius.gameserver.network.GameClient; */ public interface IClientIncomingPacket extends IIncomingPacket { - Logger LOGGER = Logger.getLogger(IClientIncomingPacket.class.getName()); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index b6effdbcb9..d2ae26c63b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -153,7 +154,7 @@ public class MultiSellChoose implements IClientIncomingPacket if (((_soulCrystalOptions != null) && CommonUtil.contains(_soulCrystalOptions, null)) || ((_soulCrystalSpecialOptions != null) && CommonUtil.contains(_soulCrystalSpecialOptions, null))) { - LOGGER.severe("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -161,14 +162,14 @@ public class MultiSellChoose implements IClientIncomingPacket final MultisellEntryHolder entry = list.getEntries().get(_entryId - 1); // Entry Id begins from 1. We currently use entry IDs as index pointer. if (entry == null) { - LOGGER.severe("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } if (!entry.isStackable() && (_amount > 1)) { - LOGGER.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -196,7 +197,7 @@ public class MultiSellChoose implements IClientIncomingPacket )) //@formatter:on { - LOGGER.severe("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -368,7 +369,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); return; } } @@ -478,7 +479,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); return; } } @@ -673,7 +674,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); + PacketLogger.warning("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); return false; } } 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 9536b7ab92..3ce36782c8 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 @@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillDone; import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; @@ -104,7 +105,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if ((_level < 1) || (_level > 1000) || (_id < 1) || (_id > 64000)) { Util.handleIllegalPlayerAction(player, "Wrong Packet Data in Aquired Skill", Config.DEFAULT_PUNISH); - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); return; } @@ -118,7 +119,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - LOGGER.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -450,7 +451,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket } default: { - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); break; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 0a570fd3ef..4bb789645a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillInfo; import org.l2jmobius.gameserver.network.serverpackets.ExAcquireSkillInfo; @@ -55,7 +56,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket { if ((_id <= 0) || (_level <= 0)) { - LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); return; } @@ -74,7 +75,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level); if (skill == null) { - LOGGER.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); + PacketLogger.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); return; } 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 5e0a2af0c9..8078d0c10e 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.Arrays; -import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.ActionData; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; @@ -41,8 +41,6 @@ import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList; */ public class RequestActionUse implements IClientIncomingPacket { - private static final Logger LOGGER = Logger.getLogger(RequestActionUse.class.getName()); - private int _actionId; private boolean _ctrlPressed; private boolean _shiftPressed; @@ -93,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } @@ -107,7 +105,7 @@ public class RequestActionUse implements IClientIncomingPacket actionHandler.useAction(player, actionHolder, _ctrlPressed, _shiftPressed); return; } - LOGGER.warning("Couldnt find handler with name: " + actionHolder.getHandler()); + PacketLogger.warning("Couldn't find handler with name: " + actionHolder.getHandler()); return; } @@ -143,7 +141,7 @@ public class RequestActionUse implements IClientIncomingPacket } default: { - LOGGER.warning(player.getName() + ": unhandled action type " + _actionId); + PacketLogger.warning(player.getName() + ": unhandled action type " + _actionId); break; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java index 1fa1214bea..76649875f1 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.data.xml.FakePlayerData; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -130,7 +131,7 @@ public class RequestBlock implements IClientIncomingPacket } default: { - LOGGER.info("Unknown 0xA9 block type: " + _type); + PacketLogger.info("Unknown 0xA9 block type: " + _type); } } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index e83f8665fd..106581d3f1 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -161,7 +162,7 @@ public class RequestBuyItem implements IClientIncomingPacket long price = product.getPrice(); if (price < 0) { - LOGGER.warning("ERROR, no price found .. wrong buylist ??"); + PacketLogger.warning("ERROR, no price found .. wrong buylist ??"); client.sendPacket(ActionFailed.STATIC_PACKET); 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 47214311ac..4d8e55bc8e 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.StringTokenizer; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -43,6 +42,7 @@ import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -90,7 +90,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -194,7 +194,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (NumberFormatException nfe) { - LOGGER.log(Level.WARNING, "NFE for command [" + _command + "]", nfe); + PacketLogger.warning("NFE for command [" + _command + "] " + nfe.getMessage()); } } else if (_command.startsWith("_match")) @@ -295,13 +295,13 @@ public class RequestBypassToServer implements IClientIncomingPacket } else { - LOGGER.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); + PacketLogger.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); } } } catch (Exception e) { - LOGGER.log(Level.WARNING, "Exception processing bypass from player " + player.getName() + ": " + _command, e); + PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _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/RequestCrystallizeItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index f3d775a15b..be08d7f35d 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -59,7 +60,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.finer("RequestCrystalizeItem: activeChar was null"); + // PacketLogger.finer("RequestCrystalizeItem: activeChar was null."); return; } @@ -87,7 +88,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - LOGGER.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 4f351a636b..cb90d581c8 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; @@ -33,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -169,7 +169,7 @@ public class RequestDestroyItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not delete pet objectid: ", e); + PacketLogger.warning("Could not delete pet objectid: " + e.getMessage()); } } if (itemToRemove.isTimeLimitedItem()) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 0e4b623bb3..b7d4ac63a9 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.GMAudit; import org.l2jmobius.gameserver.util.Util; @@ -210,7 +211,7 @@ public class RequestDropItem implements IClientIncomingPacket if ((dropedItem != null) && (dropedItem.getId() == Inventory.ADENA_ID) && (dropedItem.getCount() >= 1000000)) { final String msg = "Character (" + player.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")"; - LOGGER.warning(msg); + PacketLogger.warning(msg); AdminData.getInstance().broadcastMessageToGMs(msg); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java index e3ab837779..e8bfc249c9 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ExNeedToChangeName; /** @@ -42,6 +43,6 @@ public class RequestExChangeName implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); + PacketLogger.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java index 6e4861568e..c2f02f89ad 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chdd d: Arena d: Team @@ -74,7 +75,7 @@ public class RequestExCubeGameChangeTeam implements IClientIncomingPacket } default: { - LOGGER.warning("Wrong Cube Game Team ID: " + _team); + PacketLogger.warning("Wrong Cube Game Team ID: " + _team); break; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java index 009b836b6d..d72fdfc413 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chddd d: Arena d: Answer @@ -64,7 +65,7 @@ public class RequestExCubeGameReadyAnswer implements IClientIncomingPacket } default: { - LOGGER.warning("Unknown Cube Game Answer ID: " + _answer); + PacketLogger.warning("Unknown Cube Game Answer ID: " + _answer); break; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java index ff12adb20d..3347f01941 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) just a trigger @@ -34,6 +35,6 @@ public class RequestExFishRanking implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestExFishRanking"); + PacketLogger.info("C5: RequestExFishRanking"); } } \ No newline at end of file diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 57e8e7d2e5..8851aef463 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; import org.l2jmobius.gameserver.util.Broadcast; @@ -86,7 +87,7 @@ public class RequestExMagicSkillUseGround implements IClientIncomingPacket else { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("No skill found with id " + _skillId + " and level " + level + " !!"); + PacketLogger.warning("No skill found with id " + _skillId + " and level " + level + " !!"); } } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 77093c5f2d..2d9f0456f4 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; @@ -73,7 +74,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket client.sendPacket(new ExPutEnchantTargetItemResult(0)); if (scrollTemplate == null) { - LOGGER.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); + PacketLogger.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); } return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java index 05e09e6dfc..0a4522bf64 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressMapInfo; @@ -43,7 +44,7 @@ public class RequestFortressMapInfo implements IClientIncomingPacket final Fort fort = FortManager.getInstance().getFortById(_fortressId); if (fort == null) { - LOGGER.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); + PacketLogger.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); if (client.getPlayer() == null) { 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 f65a63d325..dc903790d0 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 @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) d @@ -44,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - LOGGER.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning("Player " + 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/RequestGetItemFromPet.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index a9fd8d923a..48e75fc61b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.util.Util; @@ -84,7 +85,7 @@ public class RequestGetItemFromPet implements IClientIncomingPacket } else { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 79e1193ac0..22f2f24422 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.util.Util; @@ -124,7 +125,7 @@ public class RequestGiveItemToPet implements IClientIncomingPacket } else { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } 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 eab1e325f5..04b9115f3d 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 @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaEquipList; @@ -60,7 +61,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.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 fa21b68043..a7c019d65d 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; @@ -52,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - LOGGER.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); } client.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 b943775334..ff96a400c9 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; @@ -50,10 +51,11 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.sendPacket(ActionFailed.STATIC_PACKET); return; } + player.sendPacket(new HennaItemRemoveInfo(henna, player)); } } 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 70e2f43664..2e95a321ee 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -75,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); client.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 53f04488a6..ada67e190c 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -49,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - LOGGER.warning("Player " + actor.getName() + " sent empty html link!"); + PacketLogger.warning("Player " + actor.getName() + " sent empty html link!"); return; } if (_link.contains("..")) { - LOGGER.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); return; } final int htmlObjectId = actor.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - LOGGER.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java index 89adeae67b..2e1c1c83f6 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author UnAfraid @@ -51,7 +52,7 @@ public class RequestMagicSkillList implements IClientIncomingPacket if (player.getObjectId() != _objectId) { - LOGGER.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); + PacketLogger.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 9432941937..a228079092 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -64,7 +64,7 @@ public class RequestMagicSkillUse implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); // if (_magicId > 0) // { - // LOGGER.warning("Skill Id " + _magicId + " not found in player: " + player); + // PacketLogger.warning("Skill Id " + _magicId + " not found in player: " + player); // } return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index c3e6388c45..475c67f269 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListDelete; @@ -71,7 +72,7 @@ public class RequestOustPledgeMember implements IClientIncomingPacket final ClanMember member = clan.getClanMember(_target); if (member == null) { - LOGGER.warning("Target (" + _target + ") is not member of the clan"); + PacketLogger.warning("Target (" + _target + ") is not member of the clan"); return; } if (member.isOnline() && member.getPlayer().isInCombat()) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java index 9702554c3b..209835b319 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) S @@ -37,6 +38,6 @@ public class RequestPCCafeCouponUse implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestPCCafeCouponUse: S: " + _str); + PacketLogger.info("C5: RequestPCCafeCouponUse: S: " + _str); } } 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 7da966ce9f..2cd9c6a8d1 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 @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -120,7 +121,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item item = player.checkItemManipulation(i.getId(), i.getCount(), "freight"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); warehouse.deleteMe(); return; } @@ -169,7 +170,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); warehouse.deleteMe(); return; } @@ -177,7 +178,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem("Trade", i.getId(), i.getCount(), warehouse, player, null); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 2c715b4efb..0d858fb452 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -137,7 +138,7 @@ public class RequestPetUseItem implements IClientIncomingPacket else { player.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM); - LOGGER.warning("No item handler registered for itemId: " + item.getId()); + PacketLogger.warning("No item handler registered for itemId: " + item.getId()); } } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index 8ece2b3ec7..fec0dc36a0 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -25,6 +25,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Plim @@ -74,7 +75,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket } catch (SQLException e) { - LOGGER.severe("Error while saving petition feedback"); + PacketLogger.warning("Error while saving petition feedback."); } } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java index d212481717..3459b04c80 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java @@ -44,8 +44,8 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket @Override public void run(GameClient client) { - // LOGGER.info("C5: RequestPledgeMemberInfo d:"+_unk1); - // LOGGER.info("C5: RequestPledgeMemberInfo S:"+_player); + // PacketLogger.info("C5: RequestPledgeMemberInfo d:"+_unk1); + // PacketLogger.info("C5: RequestPledgeMemberInfo S:"+_player); final Player player = client.getPlayer(); if (player == null) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index e56c105cf4..44bbd9d34c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.HashMap; import java.util.Map; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -38,6 +37,7 @@ import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; @@ -74,7 +74,7 @@ public class RequestPreviewItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } @@ -152,7 +152,7 @@ public class RequestPreviewItem implements IClientIncomingPacket final Merchant merchant = (target instanceof Merchant) ? (Merchant) target : null; if (merchant == null) { - LOGGER.warning("Null merchant!"); + PacketLogger.warning(getClass().getSimpleName() + ": Null merchant!"); 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 251757c0ba..94958bc4fe 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.util.Util; @@ -145,7 +146,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if (result > 1) { - LOGGER.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); } return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java index 9998465898..8ab3d4962f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; public class RequestPrivateStoreSell implements IClientIncomingPacket @@ -134,7 +135,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket if (!storeList.privateStoreSell(player, _items)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index a4010ca2cb..1632df189f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -193,7 +194,7 @@ public class RequestRefundItem implements IClientIncomingPacket final Item item = player.getRefund().transferItem("Refund", objectIds[i], Long.MAX_VALUE, player.getInventory(), player, player.getLastFolkNPC()); if (item == null) { - LOGGER.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index ee78579ea4..8a2f42272a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket { @@ -54,7 +55,7 @@ public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket } else { - LOGGER.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); + PacketLogger.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); } player.onTransactionRequest(requestor); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index afc4e65df4..08ad2c7763 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @version $Revision: 1.7.2.3.2.6 $ $Date: 2005/03/27 15:29:30 $ @@ -139,7 +140,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if ((player.getClan() == null) || (player.getClan().getHideoutId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.CLANHALL); @@ -167,7 +168,7 @@ public class RequestRestartPoint implements IClientIncomingPacket } else { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); return; } } @@ -199,7 +200,7 @@ public class RequestRestartPoint implements IClientIncomingPacket final Clan clan = player.getClan(); if ((clan == null) || (clan.getFortId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.FORTRESS); @@ -231,7 +232,7 @@ public class RequestRestartPoint implements IClientIncomingPacket if (((siegeClan == null) || siegeClan.getFlag().isEmpty())) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.SIEGEFLAG); @@ -241,7 +242,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if (!player.isGM() && !player.getInventory().haveItemForSelfResurrection()) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); return; } if (player.isGM() || player.destroyItemByItemId("Feather", 10649, 1, player, false) || player.destroyItemByItemId("Feather", 13300, 1, player, false) || player.destroyItemByItemId("Feather", 13128, 1, player, false)) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index db2856317d..261390363c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExNoticePostSent; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -316,14 +317,14 @@ public class RequestSendPost implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getObjectId(), i.getCount(), "attach"); if ((oldItem == null) || !oldItem.isTradeable() || oldItem.isEquipped()) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); return false; } final Item newItem = player.getInventory().transferItem("SendMail", i.getObjectId(), i.getCount(), attachments, player, msg.getReceiverName() + "[" + msg.getReceiverId() + "]"); if (newItem == null) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java index 2a33016c9a..b5d130046c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -54,16 +55,16 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket final Castle castle = CastleManager.getInstance().getCastleById(_castleId); if ((player == null) || (castle == null)) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); return; } if ((castle.getOwnerId() > 0) && (castle.getOwnerId() != player.getClanId())) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); } else if (!player.isClanLeader()) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); } else if (!castle.isTimeRegistrationOver()) { @@ -79,12 +80,12 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); } } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); } } 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 15e138aa4f..eef80fb9e2 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 @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; @@ -108,7 +109,7 @@ public class Say2 implements IClientIncomingPacket ChatType chatType = ChatType.findByClientId(_type); if (chatType == null) { - LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); + PacketLogger.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -116,7 +117,7 @@ public class Say2 implements IClientIncomingPacket if (_text.isEmpty()) { - LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); + PacketLogger.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -210,7 +211,7 @@ public class Say2 implements IClientIncomingPacket } else { - LOGGER.info("No handler registered for ChatType: " + _type + " Player: " + client); + PacketLogger.info("No handler registered for ChatType: " + _type + " Player: " + client); } } @@ -256,7 +257,7 @@ public class Say2 implements IClientIncomingPacket final Item item = owner.getInventory().getItemByObjectId(id); if (item == null) { - LOGGER.info(client + " trying publish item which doesnt own! ID:" + id); + PacketLogger.info(client + " trying publish item which doesnt own! ID:" + id); return false; } item.publish(); @@ -264,7 +265,7 @@ public class Say2 implements IClientIncomingPacket pos1 = _text.indexOf(8, pos) + 1; if (pos1 == 0) // missing ending tag { - LOGGER.info(client + " sent invalid publish item msg! ID:" + id); + PacketLogger.info(client + " sent invalid publish item msg! ID:" + id); return false; } } 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 f89be1cfcb..84b879e0f7 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 @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -127,7 +128,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item item = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); return; } @@ -174,7 +175,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } @@ -186,7 +187,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem(warehouse.getName(), itemHolder.getId(), itemHolder.getCount(), warehouse, player, manager); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 1840fcded7..647761584a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; @@ -163,13 +164,13 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket final Item oldItem = warehouse.getItemByObjectId(i.getId()); if ((oldItem == null) || (oldItem.getCount() < i.getCount())) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } final Item newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, manager); if (newItem == null) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); return; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index ca18e8faba..b1e2aa4b15 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -43,6 +43,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUseSharedGroupItem; @@ -271,7 +272,7 @@ public class UseItem implements IClientIncomingPacket { if ((etcItem != null) && (etcItem.getHandlerName() != null)) { - LOGGER.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); + PacketLogger.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); } } else if (handler.useItem(player, item, _ctrlPressed)) 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 36f9206cb0..ece66b1cd9 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -56,12 +57,12 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final SkillHolder holder = new SkillHolder(packet.readD(), packet.readD()); if (holder.getSkillLevel() < 1) { - LOGGER.warning("Player " + client + " is trying to learn skill " + holder + " by sending packet with level 0!"); + PacketLogger.warning("Player " + client + " is trying to learn skill " + holder + " by sending packet with level 0!"); return false; } if (_skills.putIfAbsent(holder.getSkillId(), holder) != null) { - LOGGER.warning("Player " + client + " is trying to send two times one skill " + holder + " to learn!"); + PacketLogger.warning("Player " + client + " is trying to send two times one skill " + holder + " to learn!"); return false; } } @@ -85,7 +86,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket if ((player.getAbilityPoints() == 0) || (player.getAbilityPoints() == player.getAbilityPointsUsed())) { - LOGGER.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); return; } @@ -114,7 +115,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final SkillLearn learn = SkillTreeData.getInstance().getAbilitySkill(holder.getSkillId(), holder.getSkillLevel()); if (learn == null) { - LOGGER.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); + PacketLogger.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); client.sendPacket(ActionFailed.STATIC_PACKET); break; } @@ -122,7 +123,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final Skill skill = holder.getSkill(); if (skill == null) { - LOGGER.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); + PacketLogger.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); client.sendPacket(ActionFailed.STATIC_PACKET); break; } @@ -155,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]) { - LOGGER.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!"); + PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -165,7 +166,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket { if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel()) { - LOGGER.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); + PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -174,7 +175,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 3 Learning a skill without having enough points if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points) { - LOGGER.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java index 964fffd4a3..348dc87199 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -98,13 +99,13 @@ public class RequestAlchemyConversion implements IClientIncomingPacket if (data == null) { player.sendPacket(new ExAlchemyConversion(0, 0)); - LOGGER.warning("Missing AlchemyData for skillId: " + _skillId + ", skillLevel: " + _skillLevel); + PacketLogger.warning("Missing AlchemyData for skillId: " + _skillId + ", skillLevel: " + _skillLevel); return; } // if (!_ingredients.equals(data.getIngredients())) // { - // LOGGER.warning("Client ingredients are not same as server ingredients for alchemy conversion player: "+ +"", player); + // PacketLogger.warning("Client ingredients are not same as server ingredients for alchemy conversion player: "+ +"", player); // return; // } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index 68da085e66..a36649b520 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -74,7 +75,7 @@ public class RequestAlchemyTryMixCube implements IClientIncomingPacket else // Player used packet injection tool. { final Player player = client.getPlayer(); - LOGGER.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName()); + PacketLogger.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName()); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return false; } 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 20d84a2bd6..6b2f96e87d 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; @@ -60,37 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - LOGGER.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 30% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 100% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - LOGGER.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - - LOGGER.warning("Player " + player + ": Auction House (15-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); return; - } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - LOGGER.warning("Player " + player + ": Auction House (30-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + 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/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index b4b5bd9011..e4e46a5271 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -94,7 +95,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning(player + ": tried to crystallize " + item.getItem()); + PacketLogger.warning(player + ": tried to crystallize " + item.getItem()); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index 6a17e5856a..1465b00631 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets.ensoul; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnsoulData; import org.l2jmobius.gameserver.enums.PrivateStoreType; @@ -28,6 +26,7 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -39,7 +38,6 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; */ public class RequestItemEnsoul implements IClientIncomingPacket { - private static final Logger LOGGER = Logger.getLogger(RequestItemEnsoul.class.getName()); private int _itemObjectId; private EnsoulItemOption[] _options; @@ -119,37 +117,37 @@ public class RequestItemEnsoul implements IClientIncomingPacket final Item item = player.getInventory().getItemByObjectId(_itemObjectId); if (item == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item without having it!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item without having it!"); return; } if (!item.isEquipable()) { - LOGGER.warning("Player: " + player + " attempting to ensoul non equippable item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul non equippable item: " + item + "!"); return; } if (!item.isWeapon()) { - LOGGER.warning("Player: " + player + " attempting to ensoul item that's not a weapon: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item that's not a weapon: " + item + "!"); return; } if (item.isCommonItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul common item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul common item: " + item + "!"); return; } if (item.isShadowItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul shadow item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul shadow item: " + item + "!"); return; } if (item.isHeroItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul hero item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul hero item: " + item + "!"); return; } if ((_options == null) || (_options.length == 0)) { - LOGGER.warning("Player: " + player + " attempting to ensoul item without any special ability declared!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item without any special ability declared!"); return; } @@ -173,14 +171,14 @@ public class RequestItemEnsoul implements IClientIncomingPacket if (!stone.getOptions().contains(itemOption.getSoulCrystalOption())) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that stone doesn't contains!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that stone doesn't contains!"); continue; } final EnsoulOption option = EnsoulData.getInstance().getOption(itemOption.getSoulCrystalOption()); if (option == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that doesn't exists!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that doesn't exists!"); continue; } @@ -205,13 +203,13 @@ public class RequestItemEnsoul implements IClientIncomingPacket } else { - LOGGER.warning("Player: " + player + " attempting to ensoul item option with unhandled type: " + itemOption.getType() + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option with unhandled type: " + itemOption.getType() + "!"); continue; } if (fee == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that doesn't exists! (unknown fee)"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that doesn't exists! (unknown fee)"); continue; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java index 3f29f579da..11b1da5ff3 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java @@ -18,12 +18,12 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -102,7 +102,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e); + PacketLogger.warning("Could not add friend objectid: " + e.getMessage()); } } else diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java index 99fc483839..01307e7a6d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -26,6 +25,7 @@ import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -99,7 +99,7 @@ public class RequestFriendDel implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not del friend objectid: ", e); + PacketLogger.warning("Could not del friend objectid: " + e.getMessage()); } } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index 8a70490d53..0d44f11c1e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.mentoring; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMenteeAdd; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -93,7 +93,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, e.getMessage(), e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index 41700d0f61..39121a166d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; @@ -56,7 +57,7 @@ public class RequestExPledgeMissionReward implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { - LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); + PacketLogger.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java index ee8910d06e..a53878b794 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductList; @@ -60,7 +61,7 @@ public class RequestBRProductList implements IClientIncomingPacket } default: { - LOGGER.warning(player + " send unhandled product list type: " + _type); + PacketLogger.warning(player + " send unhandled product list type: " + _type); break; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java index e83bf335a7..a828073bb9 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.SayuneRequest; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.type.SayuneZone; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; @@ -72,7 +73,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (zone.getMapId() == -1) { player.sendMessage("That zone is not supported yet!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); return; } @@ -80,7 +81,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (map == null) { player.sendMessage("This zone is not handled yet!!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); return; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java index f1ede4ef0a..41648f184f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Shuttle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -60,7 +61,7 @@ public class RequestShuttleGetOn implements IClientIncomingPacket player.getInVehiclePosition().setXYZ(_x, _y, _z); break; } - LOGGER.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); + PacketLogger.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); } } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 33eeff5060..1b8ddb2042 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -16,11 +16,10 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Level; - import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.util.Util; /** @@ -75,7 +74,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { if (html.length() > 17200) { - LOGGER.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable()); + PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } @@ -94,7 +93,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket if (content == null) { setHtml("My Text is missing:
" + path + ""); - LOGGER.warning("missing html page " + path); + PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index e6b4b8b604..57ed88ac29 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; /** @@ -46,7 +47,7 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index d94dbf4403..75f6596194 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Migi, DS @@ -44,7 +45,7 @@ public class ExReplySentPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index b0f3738683..15d011befc 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author KenM @@ -54,7 +55,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); + PacketLogger.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); packet.writeS(""); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index bff97454e1..e7d3f6f386 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IOutgoingPacket; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; @@ -28,8 +26,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; */ public interface IClientOutgoingPacket extends IOutgoingPacket { - Logger LOGGER = Logger.getLogger(IClientOutgoingPacket.class.getName()); - int[] PAPERDOLL_ORDER = new int[] { Inventory.PAPERDOLL_UNDER, diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 29a4f31530..79d478aff9 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan.SubPledge; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author -Wooden- @@ -56,7 +57,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket } else if (_clan.getClanMember(LeaderId) == null) { - LOGGER.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); + PacketLogger.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); return ""; } else diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index a95e7ab97c..d9c2621c84 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.RecipeData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.RecipeHolder; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class RecipeItemMakeInfo implements IClientOutgoingPacket { @@ -77,7 +78,8 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeQ(_offeringMaximumAdena); // Adena worth of items for maximum offering. return true; } - LOGGER.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); + + PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 432ff8ad7f..0a3fe46cb7 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Shows the Siege Info
@@ -78,7 +79,7 @@ public class SiegeInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Null owner for castle: " + _castle.getName()); + PacketLogger.warning("Null owner for castle: " + _castle.getName()); } } else diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 44f290e92f..746b2da3f7 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; @@ -157,7 +158,7 @@ public class SystemMessage implements IClientOutgoingPacket // Mobius: With additional on-screen damage param (popup), length is increased. if (param.getType() != TYPE_POPUP_ID) { - LOGGER.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); + PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } @@ -414,7 +415,7 @@ public class SystemMessage implements IClientOutgoingPacket { if (param == null) { - LOGGER.warning("Found null parameter for SystemMessageId " + _smId); + PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 37150ec357..7af1cd273c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -24,6 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class WareHouseWithdrawalList extends AbstractItemPacket { @@ -56,7 +57,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket _invSize = player.getInventory().getSize(); if (_player.getActiveWarehouse() == null) { - LOGGER.warning("error while sending withdraw request to: " + _player.getName()); + PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/PacketLogger.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/PacketLogger.java new file mode 100644 index 0000000000..5b5a083a99 --- /dev/null +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/PacketLogger.java @@ -0,0 +1,42 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.network; + +import java.util.logging.Logger; + +/** + * @author Mobius + */ +public class PacketLogger +{ + private static final Logger LOGGER = Logger.getLogger(PacketLogger.class.getName()); + + public static synchronized void warning(String message) + { + LOGGER.warning(message); + } + + public static synchronized void info(String message) + { + LOGGER.info(message); + } + + public static synchronized void finer(String message) + { + LOGGER.finer(message); + } +} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 7c343f78be..ef3f4acc18 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -161,7 +162,7 @@ public class Action implements IClientIncomingPacket default: { // Invalid action detected (probably client cheating), log this - LOGGER.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); + PacketLogger.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); client.sendPacket(ActionFailed.STATIC_PACKET); break; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index 31d29ef3dd..8e8ae2c190 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; import org.l2jmobius.gameserver.network.serverpackets.TradeOwnAdd; @@ -58,7 +59,7 @@ public class AddTradeItem implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - LOGGER.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); + PacketLogger.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); return; } @@ -68,7 +69,7 @@ public class AddTradeItem implements IClientIncomingPacket // Trade partner not found, cancel trade if (partner != null) { - LOGGER.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); + PacketLogger.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); } player.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE); player.cancelActiveTrade(); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 20134dd2bb..a3236b0d83 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -62,7 +62,7 @@ public class CannotMoveAnymore implements IClientIncomingPacket // player.stopMove(); // // if (Config.DEBUG) - // LOGGER.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ + // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); // StopMove smwl = new StopMove(player); // client.getPlayer().sendPacket(smwl); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 6b63144276..4350bab43a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -46,6 +46,7 @@ import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; import org.l2jmobius.gameserver.network.serverpackets.CharCreateOk; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -127,21 +128,21 @@ public class CharacterCreate implements IClientIncomingPacket if ((_face > 2) || (_face < 0)) { - LOGGER.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairStyle < 0) || ((_sex == 0) && (_hairStyle > 4)) || ((_sex != 0) && (_hairStyle > 6))) { - LOGGER.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairColor > 3) || (_hairColor < 0)) { - LOGGER.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } @@ -345,7 +346,7 @@ public class CharacterCreate implements IClientIncomingPacket final Item item = newChar.getInventory().addItem("Init", ie.getId(), ie.getCount(), newChar, null); if (item == null) { - LOGGER.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); + PacketLogger.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); continue; } @@ -362,7 +363,7 @@ public class CharacterCreate implements IClientIncomingPacket final Item item = newChar.getInventory().addItem("Balthus Rewards", reward.getId(), reward.getCount(), newChar, null); if (item == null) { - LOGGER.warning("Could not create item during char creation: itemId " + reward.getId() + ", amount " + reward.getCount() + "."); + PacketLogger.warning("Could not create item during char creation: itemId " + reward.getId() + ", amount " + reward.getCount() + "."); continue; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java index 86c425fa45..63c3261946 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Level; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.CharacterDeleteFailType; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -25,6 +23,7 @@ import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDelete; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteFail; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteSuccess; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -74,7 +73,7 @@ public class CharacterDelete implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Error:", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1, 0); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java index 5f74c38273..cfe9b20f3d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java @@ -47,7 +47,7 @@ public class EndScenePlayer implements IClientIncomingPacket final MovieHolder holder = player.getMovieHolder(); if ((holder == null) || (holder.getMovie().getClientId() != _movieId)) { - // LOGGER.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); + // PacketLogger.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 9298323f1f..d28d3e54c1 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -69,6 +69,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.Die; @@ -152,7 +153,7 @@ public class EnterWorld implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.warning("EnterWorld failed! player returned 'null'."); + PacketLogger.warning("EnterWorld failed! player returned 'null'."); Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java index 8bde20da0a..14e8153478 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java @@ -25,9 +25,13 @@ import org.l2jmobius.gameserver.network.GameClient; */ public class ExGetOnAirShip implements IClientIncomingPacket { + @SuppressWarnings("unused") private int _x; + @SuppressWarnings("unused") private int _y; + @SuppressWarnings("unused") private int _z; + @SuppressWarnings("unused") private int _shipId; @Override @@ -43,9 +47,9 @@ public class ExGetOnAirShip implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("[T1:ExGetOnAirShip] x: " + _x); - LOGGER.info("[T1:ExGetOnAirShip] y: " + _y); - LOGGER.info("[T1:ExGetOnAirShip] z: " + _z); - LOGGER.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); + // PacketLogger.info("[T1:ExGetOnAirShip] x: " + _x); + // PacketLogger.info("[T1:ExGetOnAirShip] y: " + _y); + // PacketLogger.info("[T1:ExGetOnAirShip] z: " + _z); + // PacketLogger.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java index fcdd8335f4..4e91188f5c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java @@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Arrays; -import java.util.logging.Level; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: c dddd @@ -79,7 +79,7 @@ public class GameGuardReply implements IClientIncomingPacket } catch (NoSuchAlgorithmException e) { - LOGGER.log(Level.WARNING, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java index eddff9f891..62e69acd86 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.gameserver.network.GameClient; @@ -27,5 +25,4 @@ import org.l2jmobius.gameserver.network.GameClient; */ public interface IClientIncomingPacket extends IIncomingPacket { - Logger LOGGER = Logger.getLogger(IClientIncomingPacket.class.getName()); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index b6effdbcb9..d2ae26c63b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -153,7 +154,7 @@ public class MultiSellChoose implements IClientIncomingPacket if (((_soulCrystalOptions != null) && CommonUtil.contains(_soulCrystalOptions, null)) || ((_soulCrystalSpecialOptions != null) && CommonUtil.contains(_soulCrystalSpecialOptions, null))) { - LOGGER.severe("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -161,14 +162,14 @@ public class MultiSellChoose implements IClientIncomingPacket final MultisellEntryHolder entry = list.getEntries().get(_entryId - 1); // Entry Id begins from 1. We currently use entry IDs as index pointer. if (entry == null) { - LOGGER.severe("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } if (!entry.isStackable() && (_amount > 1)) { - LOGGER.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -196,7 +197,7 @@ public class MultiSellChoose implements IClientIncomingPacket )) //@formatter:on { - LOGGER.severe("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -368,7 +369,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); return; } } @@ -478,7 +479,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); return; } } @@ -673,7 +674,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); + PacketLogger.warning("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); return false; } } 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 4e5614e25b..e4a56f0f63 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 @@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillDone; import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; @@ -104,7 +105,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if ((_level < 1) || (_level > 1000) || (_id < 1) || (_id > 64000)) { Util.handleIllegalPlayerAction(player, "Wrong Packet Data in Aquired Skill", Config.DEFAULT_PUNISH); - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); return; } @@ -118,7 +119,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - LOGGER.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -450,7 +451,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket } default: { - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); break; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 0a570fd3ef..4bb789645a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillInfo; import org.l2jmobius.gameserver.network.serverpackets.ExAcquireSkillInfo; @@ -55,7 +56,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket { if ((_id <= 0) || (_level <= 0)) { - LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); return; } @@ -74,7 +75,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level); if (skill == null) { - LOGGER.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); + PacketLogger.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); return; } 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 5e0a2af0c9..8078d0c10e 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.Arrays; -import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.ActionData; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; @@ -41,8 +41,6 @@ import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList; */ public class RequestActionUse implements IClientIncomingPacket { - private static final Logger LOGGER = Logger.getLogger(RequestActionUse.class.getName()); - private int _actionId; private boolean _ctrlPressed; private boolean _shiftPressed; @@ -93,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } @@ -107,7 +105,7 @@ public class RequestActionUse implements IClientIncomingPacket actionHandler.useAction(player, actionHolder, _ctrlPressed, _shiftPressed); return; } - LOGGER.warning("Couldnt find handler with name: " + actionHolder.getHandler()); + PacketLogger.warning("Couldn't find handler with name: " + actionHolder.getHandler()); return; } @@ -143,7 +141,7 @@ public class RequestActionUse implements IClientIncomingPacket } default: { - LOGGER.warning(player.getName() + ": unhandled action type " + _actionId); + PacketLogger.warning(player.getName() + ": unhandled action type " + _actionId); break; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java index 1fa1214bea..76649875f1 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.data.xml.FakePlayerData; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -130,7 +131,7 @@ public class RequestBlock implements IClientIncomingPacket } default: { - LOGGER.info("Unknown 0xA9 block type: " + _type); + PacketLogger.info("Unknown 0xA9 block type: " + _type); } } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index e83f8665fd..106581d3f1 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -161,7 +162,7 @@ public class RequestBuyItem implements IClientIncomingPacket long price = product.getPrice(); if (price < 0) { - LOGGER.warning("ERROR, no price found .. wrong buylist ??"); + PacketLogger.warning("ERROR, no price found .. wrong buylist ??"); client.sendPacket(ActionFailed.STATIC_PACKET); 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 47214311ac..4d8e55bc8e 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.StringTokenizer; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -43,6 +42,7 @@ import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -90,7 +90,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -194,7 +194,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (NumberFormatException nfe) { - LOGGER.log(Level.WARNING, "NFE for command [" + _command + "]", nfe); + PacketLogger.warning("NFE for command [" + _command + "] " + nfe.getMessage()); } } else if (_command.startsWith("_match")) @@ -295,13 +295,13 @@ public class RequestBypassToServer implements IClientIncomingPacket } else { - LOGGER.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); + PacketLogger.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); } } } catch (Exception e) { - LOGGER.log(Level.WARNING, "Exception processing bypass from player " + player.getName() + ": " + _command, e); + PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _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/RequestCrystallizeItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index f3d775a15b..be08d7f35d 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -59,7 +60,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.finer("RequestCrystalizeItem: activeChar was null"); + // PacketLogger.finer("RequestCrystalizeItem: activeChar was null."); return; } @@ -87,7 +88,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - LOGGER.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 4f351a636b..cb90d581c8 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; @@ -33,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -169,7 +169,7 @@ public class RequestDestroyItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not delete pet objectid: ", e); + PacketLogger.warning("Could not delete pet objectid: " + e.getMessage()); } } if (itemToRemove.isTimeLimitedItem()) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 0e4b623bb3..b7d4ac63a9 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.GMAudit; import org.l2jmobius.gameserver.util.Util; @@ -210,7 +211,7 @@ public class RequestDropItem implements IClientIncomingPacket if ((dropedItem != null) && (dropedItem.getId() == Inventory.ADENA_ID) && (dropedItem.getCount() >= 1000000)) { final String msg = "Character (" + player.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")"; - LOGGER.warning(msg); + PacketLogger.warning(msg); AdminData.getInstance().broadcastMessageToGMs(msg); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java index e3ab837779..e8bfc249c9 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ExNeedToChangeName; /** @@ -42,6 +43,6 @@ public class RequestExChangeName implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); + PacketLogger.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java index 6e4861568e..c2f02f89ad 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chdd d: Arena d: Team @@ -74,7 +75,7 @@ public class RequestExCubeGameChangeTeam implements IClientIncomingPacket } default: { - LOGGER.warning("Wrong Cube Game Team ID: " + _team); + PacketLogger.warning("Wrong Cube Game Team ID: " + _team); break; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java index 009b836b6d..d72fdfc413 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chddd d: Arena d: Answer @@ -64,7 +65,7 @@ public class RequestExCubeGameReadyAnswer implements IClientIncomingPacket } default: { - LOGGER.warning("Unknown Cube Game Answer ID: " + _answer); + PacketLogger.warning("Unknown Cube Game Answer ID: " + _answer); break; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java index ff12adb20d..3347f01941 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) just a trigger @@ -34,6 +35,6 @@ public class RequestExFishRanking implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestExFishRanking"); + PacketLogger.info("C5: RequestExFishRanking"); } } \ No newline at end of file diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 57e8e7d2e5..8851aef463 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; import org.l2jmobius.gameserver.util.Broadcast; @@ -86,7 +87,7 @@ public class RequestExMagicSkillUseGround implements IClientIncomingPacket else { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("No skill found with id " + _skillId + " and level " + level + " !!"); + PacketLogger.warning("No skill found with id " + _skillId + " and level " + level + " !!"); } } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 77093c5f2d..2d9f0456f4 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; @@ -73,7 +74,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket client.sendPacket(new ExPutEnchantTargetItemResult(0)); if (scrollTemplate == null) { - LOGGER.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); + PacketLogger.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); } return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java index 05e09e6dfc..0a4522bf64 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressMapInfo; @@ -43,7 +44,7 @@ public class RequestFortressMapInfo implements IClientIncomingPacket final Fort fort = FortManager.getInstance().getFortById(_fortressId); if (fort == null) { - LOGGER.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); + PacketLogger.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); if (client.getPlayer() == null) { 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 f65a63d325..dc903790d0 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 @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) d @@ -44,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - LOGGER.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning("Player " + 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/RequestGetItemFromPet.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index a9fd8d923a..48e75fc61b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.util.Util; @@ -84,7 +85,7 @@ public class RequestGetItemFromPet implements IClientIncomingPacket } else { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 79e1193ac0..22f2f24422 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.util.Util; @@ -124,7 +125,7 @@ public class RequestGiveItemToPet implements IClientIncomingPacket } else { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } 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 eab1e325f5..04b9115f3d 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 @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaEquipList; @@ -60,7 +61,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.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 fa21b68043..a7c019d65d 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; @@ -52,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - LOGGER.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); } client.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 b943775334..ff96a400c9 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; @@ -50,10 +51,11 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.sendPacket(ActionFailed.STATIC_PACKET); return; } + player.sendPacket(new HennaItemRemoveInfo(henna, player)); } } 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 70e2f43664..2e95a321ee 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -75,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); client.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 53f04488a6..ada67e190c 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -49,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - LOGGER.warning("Player " + actor.getName() + " sent empty html link!"); + PacketLogger.warning("Player " + actor.getName() + " sent empty html link!"); return; } if (_link.contains("..")) { - LOGGER.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); return; } final int htmlObjectId = actor.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - LOGGER.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java index 89adeae67b..2e1c1c83f6 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author UnAfraid @@ -51,7 +52,7 @@ public class RequestMagicSkillList implements IClientIncomingPacket if (player.getObjectId() != _objectId) { - LOGGER.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); + PacketLogger.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 9432941937..a228079092 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -64,7 +64,7 @@ public class RequestMagicSkillUse implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); // if (_magicId > 0) // { - // LOGGER.warning("Skill Id " + _magicId + " not found in player: " + player); + // PacketLogger.warning("Skill Id " + _magicId + " not found in player: " + player); // } return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index ec42bd4ca4..58405174cd 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListDelete; @@ -71,7 +72,7 @@ public class RequestOustPledgeMember implements IClientIncomingPacket final ClanMember member = clan.getClanMember(_target); if (member == null) { - LOGGER.warning("Target (" + _target + ") is not member of the clan"); + PacketLogger.warning("Target (" + _target + ") is not member of the clan"); return; } if (member.isOnline() && member.getPlayer().isInCombat()) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java index 9702554c3b..209835b319 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) S @@ -37,6 +38,6 @@ public class RequestPCCafeCouponUse implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestPCCafeCouponUse: S: " + _str); + PacketLogger.info("C5: RequestPCCafeCouponUse: S: " + _str); } } 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 7da966ce9f..2cd9c6a8d1 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 @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -120,7 +121,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item item = player.checkItemManipulation(i.getId(), i.getCount(), "freight"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); warehouse.deleteMe(); return; } @@ -169,7 +170,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); warehouse.deleteMe(); return; } @@ -177,7 +178,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem("Trade", i.getId(), i.getCount(), warehouse, player, null); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 2c715b4efb..0d858fb452 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -137,7 +138,7 @@ public class RequestPetUseItem implements IClientIncomingPacket else { player.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM); - LOGGER.warning("No item handler registered for itemId: " + item.getId()); + PacketLogger.warning("No item handler registered for itemId: " + item.getId()); } } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index 8ece2b3ec7..fec0dc36a0 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -25,6 +25,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Plim @@ -74,7 +75,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket } catch (SQLException e) { - LOGGER.severe("Error while saving petition feedback"); + PacketLogger.warning("Error while saving petition feedback."); } } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java index d212481717..3459b04c80 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java @@ -44,8 +44,8 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket @Override public void run(GameClient client) { - // LOGGER.info("C5: RequestPledgeMemberInfo d:"+_unk1); - // LOGGER.info("C5: RequestPledgeMemberInfo S:"+_player); + // PacketLogger.info("C5: RequestPledgeMemberInfo d:"+_unk1); + // PacketLogger.info("C5: RequestPledgeMemberInfo S:"+_player); final Player player = client.getPlayer(); if (player == null) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index e56c105cf4..44bbd9d34c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.HashMap; import java.util.Map; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -38,6 +37,7 @@ import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; @@ -74,7 +74,7 @@ public class RequestPreviewItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } @@ -152,7 +152,7 @@ public class RequestPreviewItem implements IClientIncomingPacket final Merchant merchant = (target instanceof Merchant) ? (Merchant) target : null; if (merchant == null) { - LOGGER.warning("Null merchant!"); + PacketLogger.warning(getClass().getSimpleName() + ": Null merchant!"); 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 251757c0ba..94958bc4fe 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.util.Util; @@ -145,7 +146,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if (result > 1) { - LOGGER.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); } return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java index 9998465898..8ab3d4962f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; public class RequestPrivateStoreSell implements IClientIncomingPacket @@ -134,7 +135,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket if (!storeList.privateStoreSell(player, _items)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index a4010ca2cb..1632df189f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -193,7 +194,7 @@ public class RequestRefundItem implements IClientIncomingPacket final Item item = player.getRefund().transferItem("Refund", objectIds[i], Long.MAX_VALUE, player.getInventory(), player, player.getLastFolkNPC()); if (item == null) { - LOGGER.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index ee78579ea4..8a2f42272a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket { @@ -54,7 +55,7 @@ public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket } else { - LOGGER.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); + PacketLogger.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); } player.onTransactionRequest(requestor); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index afc4e65df4..08ad2c7763 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @version $Revision: 1.7.2.3.2.6 $ $Date: 2005/03/27 15:29:30 $ @@ -139,7 +140,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if ((player.getClan() == null) || (player.getClan().getHideoutId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.CLANHALL); @@ -167,7 +168,7 @@ public class RequestRestartPoint implements IClientIncomingPacket } else { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); return; } } @@ -199,7 +200,7 @@ public class RequestRestartPoint implements IClientIncomingPacket final Clan clan = player.getClan(); if ((clan == null) || (clan.getFortId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.FORTRESS); @@ -231,7 +232,7 @@ public class RequestRestartPoint implements IClientIncomingPacket if (((siegeClan == null) || siegeClan.getFlag().isEmpty())) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.SIEGEFLAG); @@ -241,7 +242,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if (!player.isGM() && !player.getInventory().haveItemForSelfResurrection()) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); return; } if (player.isGM() || player.destroyItemByItemId("Feather", 10649, 1, player, false) || player.destroyItemByItemId("Feather", 13300, 1, player, false) || player.destroyItemByItemId("Feather", 13128, 1, player, false)) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index ecb0ab9738..9f217064bb 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExNoticePostSent; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -316,14 +317,14 @@ public class RequestSendPost implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getObjectId(), i.getCount(), "attach"); if ((oldItem == null) || !oldItem.isTradeable() || oldItem.isEquipped()) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); return false; } final Item newItem = player.getInventory().transferItem("SendMail", i.getObjectId(), i.getCount(), attachments, player, msg.getReceiverName() + "[" + msg.getReceiverId() + "]"); if (newItem == null) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java index 2a33016c9a..b5d130046c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -54,16 +55,16 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket final Castle castle = CastleManager.getInstance().getCastleById(_castleId); if ((player == null) || (castle == null)) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); return; } if ((castle.getOwnerId() > 0) && (castle.getOwnerId() != player.getClanId())) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); } else if (!player.isClanLeader()) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); } else if (!castle.isTimeRegistrationOver()) { @@ -79,12 +80,12 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); } } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); } } 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 19a6780f98..04f5293545 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 @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; @@ -108,7 +109,7 @@ public class Say2 implements IClientIncomingPacket ChatType chatType = ChatType.findByClientId(_type); if (chatType == null) { - LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); + PacketLogger.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -116,7 +117,7 @@ public class Say2 implements IClientIncomingPacket if (_text.isEmpty()) { - LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); + PacketLogger.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -210,7 +211,7 @@ public class Say2 implements IClientIncomingPacket } else { - LOGGER.info("No handler registered for ChatType: " + _type + " Player: " + client); + PacketLogger.info("No handler registered for ChatType: " + _type + " Player: " + client); } } @@ -256,7 +257,7 @@ public class Say2 implements IClientIncomingPacket final Item item = owner.getInventory().getItemByObjectId(id); if (item == null) { - LOGGER.info(client + " trying publish item which doesnt own! ID:" + id); + PacketLogger.info(client + " trying publish item which doesnt own! ID:" + id); return false; } item.publish(); @@ -264,7 +265,7 @@ public class Say2 implements IClientIncomingPacket pos1 = _text.indexOf(8, pos) + 1; if (pos1 == 0) // missing ending tag { - LOGGER.info(client + " sent invalid publish item msg! ID:" + id); + PacketLogger.info(client + " sent invalid publish item msg! ID:" + id); return false; } } 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 f89be1cfcb..84b879e0f7 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 @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -127,7 +128,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item item = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); return; } @@ -174,7 +175,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } @@ -186,7 +187,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem(warehouse.getName(), itemHolder.getId(), itemHolder.getCount(), warehouse, player, manager); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 1840fcded7..647761584a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; @@ -163,13 +164,13 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket final Item oldItem = warehouse.getItemByObjectId(i.getId()); if ((oldItem == null) || (oldItem.getCount() < i.getCount())) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } final Item newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, manager); if (newItem == null) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); return; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 74f5736cf7..5bf5b6bcff 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -43,6 +43,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUseSharedGroupItem; @@ -280,7 +281,7 @@ public class UseItem implements IClientIncomingPacket { if ((etcItem != null) && (etcItem.getHandlerName() != null)) { - LOGGER.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); + PacketLogger.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); } } else if (handler.useItem(player, item, _ctrlPressed)) 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 36f9206cb0..ece66b1cd9 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -56,12 +57,12 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final SkillHolder holder = new SkillHolder(packet.readD(), packet.readD()); if (holder.getSkillLevel() < 1) { - LOGGER.warning("Player " + client + " is trying to learn skill " + holder + " by sending packet with level 0!"); + PacketLogger.warning("Player " + client + " is trying to learn skill " + holder + " by sending packet with level 0!"); return false; } if (_skills.putIfAbsent(holder.getSkillId(), holder) != null) { - LOGGER.warning("Player " + client + " is trying to send two times one skill " + holder + " to learn!"); + PacketLogger.warning("Player " + client + " is trying to send two times one skill " + holder + " to learn!"); return false; } } @@ -85,7 +86,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket if ((player.getAbilityPoints() == 0) || (player.getAbilityPoints() == player.getAbilityPointsUsed())) { - LOGGER.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); return; } @@ -114,7 +115,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final SkillLearn learn = SkillTreeData.getInstance().getAbilitySkill(holder.getSkillId(), holder.getSkillLevel()); if (learn == null) { - LOGGER.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); + PacketLogger.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); client.sendPacket(ActionFailed.STATIC_PACKET); break; } @@ -122,7 +123,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final Skill skill = holder.getSkill(); if (skill == null) { - LOGGER.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); + PacketLogger.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); client.sendPacket(ActionFailed.STATIC_PACKET); break; } @@ -155,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]) { - LOGGER.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!"); + PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -165,7 +166,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket { if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel()) { - LOGGER.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); + PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -174,7 +175,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 3 Learning a skill without having enough points if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points) { - LOGGER.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java index 964fffd4a3..348dc87199 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -98,13 +99,13 @@ public class RequestAlchemyConversion implements IClientIncomingPacket if (data == null) { player.sendPacket(new ExAlchemyConversion(0, 0)); - LOGGER.warning("Missing AlchemyData for skillId: " + _skillId + ", skillLevel: " + _skillLevel); + PacketLogger.warning("Missing AlchemyData for skillId: " + _skillId + ", skillLevel: " + _skillLevel); return; } // if (!_ingredients.equals(data.getIngredients())) // { - // LOGGER.warning("Client ingredients are not same as server ingredients for alchemy conversion player: "+ +"", player); + // PacketLogger.warning("Client ingredients are not same as server ingredients for alchemy conversion player: "+ +"", player); // return; // } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index 68da085e66..a36649b520 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -74,7 +75,7 @@ public class RequestAlchemyTryMixCube implements IClientIncomingPacket else // Player used packet injection tool. { final Player player = client.getPlayer(); - LOGGER.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName()); + PacketLogger.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName()); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return false; } 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 20d84a2bd6..6b2f96e87d 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; @@ -60,37 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - LOGGER.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 30% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 100% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - LOGGER.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - - LOGGER.warning("Player " + player + ": Auction House (15-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); return; - } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - LOGGER.warning("Player " + player + ": Auction House (30-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + 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/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index b4b5bd9011..e4e46a5271 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -94,7 +95,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning(player + ": tried to crystallize " + item.getItem()); + PacketLogger.warning(player + ": tried to crystallize " + item.getItem()); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index 6a17e5856a..1465b00631 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets.ensoul; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnsoulData; import org.l2jmobius.gameserver.enums.PrivateStoreType; @@ -28,6 +26,7 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -39,7 +38,6 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; */ public class RequestItemEnsoul implements IClientIncomingPacket { - private static final Logger LOGGER = Logger.getLogger(RequestItemEnsoul.class.getName()); private int _itemObjectId; private EnsoulItemOption[] _options; @@ -119,37 +117,37 @@ public class RequestItemEnsoul implements IClientIncomingPacket final Item item = player.getInventory().getItemByObjectId(_itemObjectId); if (item == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item without having it!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item without having it!"); return; } if (!item.isEquipable()) { - LOGGER.warning("Player: " + player + " attempting to ensoul non equippable item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul non equippable item: " + item + "!"); return; } if (!item.isWeapon()) { - LOGGER.warning("Player: " + player + " attempting to ensoul item that's not a weapon: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item that's not a weapon: " + item + "!"); return; } if (item.isCommonItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul common item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul common item: " + item + "!"); return; } if (item.isShadowItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul shadow item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul shadow item: " + item + "!"); return; } if (item.isHeroItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul hero item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul hero item: " + item + "!"); return; } if ((_options == null) || (_options.length == 0)) { - LOGGER.warning("Player: " + player + " attempting to ensoul item without any special ability declared!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item without any special ability declared!"); return; } @@ -173,14 +171,14 @@ public class RequestItemEnsoul implements IClientIncomingPacket if (!stone.getOptions().contains(itemOption.getSoulCrystalOption())) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that stone doesn't contains!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that stone doesn't contains!"); continue; } final EnsoulOption option = EnsoulData.getInstance().getOption(itemOption.getSoulCrystalOption()); if (option == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that doesn't exists!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that doesn't exists!"); continue; } @@ -205,13 +203,13 @@ public class RequestItemEnsoul implements IClientIncomingPacket } else { - LOGGER.warning("Player: " + player + " attempting to ensoul item option with unhandled type: " + itemOption.getType() + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option with unhandled type: " + itemOption.getType() + "!"); continue; } if (fee == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that doesn't exists! (unknown fee)"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that doesn't exists! (unknown fee)"); continue; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java index 3f29f579da..11b1da5ff3 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java @@ -18,12 +18,12 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -102,7 +102,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e); + PacketLogger.warning("Could not add friend objectid: " + e.getMessage()); } } else diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java index 99fc483839..01307e7a6d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -26,6 +25,7 @@ import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -99,7 +99,7 @@ public class RequestFriendDel implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not del friend objectid: ", e); + PacketLogger.warning("Could not del friend objectid: " + e.getMessage()); } } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index 8a327f1f9c..ff61b200fb 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.mentoring; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMenteeAdd; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -93,7 +93,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, e.getMessage(), e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index 41700d0f61..39121a166d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; @@ -56,7 +57,7 @@ public class RequestExPledgeMissionReward implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { - LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); + PacketLogger.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java index ee8910d06e..a53878b794 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductList; @@ -60,7 +61,7 @@ public class RequestBRProductList implements IClientIncomingPacket } default: { - LOGGER.warning(player + " send unhandled product list type: " + _type); + PacketLogger.warning(player + " send unhandled product list type: " + _type); break; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java index e83bf335a7..a828073bb9 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.SayuneRequest; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.type.SayuneZone; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; @@ -72,7 +73,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (zone.getMapId() == -1) { player.sendMessage("That zone is not supported yet!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); return; } @@ -80,7 +81,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (map == null) { player.sendMessage("This zone is not handled yet!!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); return; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java index f1ede4ef0a..41648f184f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Shuttle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -60,7 +61,7 @@ public class RequestShuttleGetOn implements IClientIncomingPacket player.getInVehiclePosition().setXYZ(_x, _y, _z); break; } - LOGGER.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); + PacketLogger.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); } } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 33eeff5060..1b8ddb2042 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -16,11 +16,10 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Level; - import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.util.Util; /** @@ -75,7 +74,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { if (html.length() > 17200) { - LOGGER.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable()); + PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } @@ -94,7 +93,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket if (content == null) { setHtml("My Text is missing:
" + path + ""); - LOGGER.warning("missing html page " + path); + PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index e6b4b8b604..57ed88ac29 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; /** @@ -46,7 +47,7 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index d94dbf4403..75f6596194 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Migi, DS @@ -44,7 +45,7 @@ public class ExReplySentPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index b0f3738683..15d011befc 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author KenM @@ -54,7 +55,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); + PacketLogger.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); packet.writeS(""); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index d588f1c7cf..b5c8628b50 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IOutgoingPacket; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; @@ -28,8 +26,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; */ public interface IClientOutgoingPacket extends IOutgoingPacket { - Logger LOGGER = Logger.getLogger(IClientOutgoingPacket.class.getName()); - int[] PAPERDOLL_ORDER = new int[] { Inventory.PAPERDOLL_UNDER, diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 29a4f31530..79d478aff9 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan.SubPledge; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author -Wooden- @@ -56,7 +57,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket } else if (_clan.getClanMember(LeaderId) == null) { - LOGGER.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); + PacketLogger.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); return ""; } else diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index a95e7ab97c..d9c2621c84 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.RecipeData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.RecipeHolder; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class RecipeItemMakeInfo implements IClientOutgoingPacket { @@ -77,7 +78,8 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeQ(_offeringMaximumAdena); // Adena worth of items for maximum offering. return true; } - LOGGER.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); + + PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 432ff8ad7f..0a3fe46cb7 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Shows the Siege Info
@@ -78,7 +79,7 @@ public class SiegeInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Null owner for castle: " + _castle.getName()); + PacketLogger.warning("Null owner for castle: " + _castle.getName()); } } else diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 44f290e92f..746b2da3f7 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; @@ -157,7 +158,7 @@ public class SystemMessage implements IClientOutgoingPacket // Mobius: With additional on-screen damage param (popup), length is increased. if (param.getType() != TYPE_POPUP_ID) { - LOGGER.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); + PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } @@ -414,7 +415,7 @@ public class SystemMessage implements IClientOutgoingPacket { if (param == null) { - LOGGER.warning("Found null parameter for SystemMessageId " + _smId); + PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 37150ec357..7af1cd273c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -24,6 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class WareHouseWithdrawalList extends AbstractItemPacket { @@ -56,7 +57,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket _invSize = player.getInventory().getSize(); if (_player.getActiveWarehouse() == null) { - LOGGER.warning("error while sending withdraw request to: " + _player.getName()); + PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/PacketLogger.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/PacketLogger.java new file mode 100644 index 0000000000..5b5a083a99 --- /dev/null +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/PacketLogger.java @@ -0,0 +1,42 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.network; + +import java.util.logging.Logger; + +/** + * @author Mobius + */ +public class PacketLogger +{ + private static final Logger LOGGER = Logger.getLogger(PacketLogger.class.getName()); + + public static synchronized void warning(String message) + { + LOGGER.warning(message); + } + + public static synchronized void info(String message) + { + LOGGER.info(message); + } + + public static synchronized void finer(String message) + { + LOGGER.finer(message); + } +} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 7c343f78be..ef3f4acc18 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -161,7 +162,7 @@ public class Action implements IClientIncomingPacket default: { // Invalid action detected (probably client cheating), log this - LOGGER.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); + PacketLogger.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); client.sendPacket(ActionFailed.STATIC_PACKET); break; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index 31d29ef3dd..8e8ae2c190 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; import org.l2jmobius.gameserver.network.serverpackets.TradeOwnAdd; @@ -58,7 +59,7 @@ public class AddTradeItem implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - LOGGER.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); + PacketLogger.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); return; } @@ -68,7 +69,7 @@ public class AddTradeItem implements IClientIncomingPacket // Trade partner not found, cancel trade if (partner != null) { - LOGGER.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); + PacketLogger.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); } player.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE); player.cancelActiveTrade(); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 20134dd2bb..a3236b0d83 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -62,7 +62,7 @@ public class CannotMoveAnymore implements IClientIncomingPacket // player.stopMove(); // // if (Config.DEBUG) - // LOGGER.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ + // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); // StopMove smwl = new StopMove(player); // client.getPlayer().sendPacket(smwl); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index a91ba39468..a6c619cf46 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -46,6 +46,7 @@ import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; import org.l2jmobius.gameserver.network.serverpackets.CharCreateOk; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -127,21 +128,21 @@ public class CharacterCreate implements IClientIncomingPacket if ((_face > 2) || (_face < 0)) { - LOGGER.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairStyle < 0) || ((_sex == 0) && (_hairStyle > 4)) || ((_sex != 0) && (_hairStyle > 6))) { - LOGGER.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairColor > 3) || (_hairColor < 0)) { - LOGGER.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } @@ -345,7 +346,7 @@ public class CharacterCreate implements IClientIncomingPacket final Item item = newChar.getInventory().addItem("Init", ie.getId(), ie.getCount(), newChar, null); if (item == null) { - LOGGER.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); + PacketLogger.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); continue; } @@ -362,7 +363,7 @@ public class CharacterCreate implements IClientIncomingPacket final Item item = newChar.getInventory().addItem("Balthus Rewards", reward.getId(), reward.getCount(), newChar, null); if (item == null) { - LOGGER.warning("Could not create item during char creation: itemId " + reward.getId() + ", amount " + reward.getCount() + "."); + PacketLogger.warning("Could not create item during char creation: itemId " + reward.getId() + ", amount " + reward.getCount() + "."); continue; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java index 86c425fa45..63c3261946 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Level; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.CharacterDeleteFailType; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -25,6 +23,7 @@ import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDelete; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteFail; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteSuccess; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -74,7 +73,7 @@ public class CharacterDelete implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Error:", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1, 0); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java index 5f74c38273..cfe9b20f3d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java @@ -47,7 +47,7 @@ public class EndScenePlayer implements IClientIncomingPacket final MovieHolder holder = player.getMovieHolder(); if ((holder == null) || (holder.getMovie().getClientId() != _movieId)) { - // LOGGER.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); + // PacketLogger.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 9298323f1f..d28d3e54c1 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -69,6 +69,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.Die; @@ -152,7 +153,7 @@ public class EnterWorld implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.warning("EnterWorld failed! player returned 'null'."); + PacketLogger.warning("EnterWorld failed! player returned 'null'."); Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java index 8bde20da0a..14e8153478 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java @@ -25,9 +25,13 @@ import org.l2jmobius.gameserver.network.GameClient; */ public class ExGetOnAirShip implements IClientIncomingPacket { + @SuppressWarnings("unused") private int _x; + @SuppressWarnings("unused") private int _y; + @SuppressWarnings("unused") private int _z; + @SuppressWarnings("unused") private int _shipId; @Override @@ -43,9 +47,9 @@ public class ExGetOnAirShip implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("[T1:ExGetOnAirShip] x: " + _x); - LOGGER.info("[T1:ExGetOnAirShip] y: " + _y); - LOGGER.info("[T1:ExGetOnAirShip] z: " + _z); - LOGGER.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); + // PacketLogger.info("[T1:ExGetOnAirShip] x: " + _x); + // PacketLogger.info("[T1:ExGetOnAirShip] y: " + _y); + // PacketLogger.info("[T1:ExGetOnAirShip] z: " + _z); + // PacketLogger.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java index fcdd8335f4..4e91188f5c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java @@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Arrays; -import java.util.logging.Level; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: c dddd @@ -79,7 +79,7 @@ public class GameGuardReply implements IClientIncomingPacket } catch (NoSuchAlgorithmException e) { - LOGGER.log(Level.WARNING, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java index eddff9f891..62e69acd86 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.gameserver.network.GameClient; @@ -27,5 +25,4 @@ import org.l2jmobius.gameserver.network.GameClient; */ public interface IClientIncomingPacket extends IIncomingPacket { - Logger LOGGER = Logger.getLogger(IClientIncomingPacket.class.getName()); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index b6effdbcb9..d2ae26c63b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -153,7 +154,7 @@ public class MultiSellChoose implements IClientIncomingPacket if (((_soulCrystalOptions != null) && CommonUtil.contains(_soulCrystalOptions, null)) || ((_soulCrystalSpecialOptions != null) && CommonUtil.contains(_soulCrystalSpecialOptions, null))) { - LOGGER.severe("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -161,14 +162,14 @@ public class MultiSellChoose implements IClientIncomingPacket final MultisellEntryHolder entry = list.getEntries().get(_entryId - 1); // Entry Id begins from 1. We currently use entry IDs as index pointer. if (entry == null) { - LOGGER.severe("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } if (!entry.isStackable() && (_amount > 1)) { - LOGGER.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -196,7 +197,7 @@ public class MultiSellChoose implements IClientIncomingPacket )) //@formatter:on { - LOGGER.severe("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -368,7 +369,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); return; } } @@ -478,7 +479,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); return; } } @@ -673,7 +674,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); + PacketLogger.warning("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); return false; } } 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 4e5614e25b..e4a56f0f63 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 @@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillDone; import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; @@ -104,7 +105,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if ((_level < 1) || (_level > 1000) || (_id < 1) || (_id > 64000)) { Util.handleIllegalPlayerAction(player, "Wrong Packet Data in Aquired Skill", Config.DEFAULT_PUNISH); - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); return; } @@ -118,7 +119,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - LOGGER.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -450,7 +451,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket } default: { - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); break; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 0a570fd3ef..4bb789645a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillInfo; import org.l2jmobius.gameserver.network.serverpackets.ExAcquireSkillInfo; @@ -55,7 +56,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket { if ((_id <= 0) || (_level <= 0)) { - LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); return; } @@ -74,7 +75,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level); if (skill == null) { - LOGGER.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); + PacketLogger.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); return; } 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 5e0a2af0c9..8078d0c10e 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.Arrays; -import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.ActionData; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; @@ -41,8 +41,6 @@ import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList; */ public class RequestActionUse implements IClientIncomingPacket { - private static final Logger LOGGER = Logger.getLogger(RequestActionUse.class.getName()); - private int _actionId; private boolean _ctrlPressed; private boolean _shiftPressed; @@ -93,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } @@ -107,7 +105,7 @@ public class RequestActionUse implements IClientIncomingPacket actionHandler.useAction(player, actionHolder, _ctrlPressed, _shiftPressed); return; } - LOGGER.warning("Couldnt find handler with name: " + actionHolder.getHandler()); + PacketLogger.warning("Couldn't find handler with name: " + actionHolder.getHandler()); return; } @@ -143,7 +141,7 @@ public class RequestActionUse implements IClientIncomingPacket } default: { - LOGGER.warning(player.getName() + ": unhandled action type " + _actionId); + PacketLogger.warning(player.getName() + ": unhandled action type " + _actionId); break; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java index 1fa1214bea..76649875f1 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.data.xml.FakePlayerData; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -130,7 +131,7 @@ public class RequestBlock implements IClientIncomingPacket } default: { - LOGGER.info("Unknown 0xA9 block type: " + _type); + PacketLogger.info("Unknown 0xA9 block type: " + _type); } } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index e83f8665fd..106581d3f1 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -161,7 +162,7 @@ public class RequestBuyItem implements IClientIncomingPacket long price = product.getPrice(); if (price < 0) { - LOGGER.warning("ERROR, no price found .. wrong buylist ??"); + PacketLogger.warning("ERROR, no price found .. wrong buylist ??"); client.sendPacket(ActionFailed.STATIC_PACKET); 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 47214311ac..4d8e55bc8e 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.StringTokenizer; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -43,6 +42,7 @@ import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -90,7 +90,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -194,7 +194,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (NumberFormatException nfe) { - LOGGER.log(Level.WARNING, "NFE for command [" + _command + "]", nfe); + PacketLogger.warning("NFE for command [" + _command + "] " + nfe.getMessage()); } } else if (_command.startsWith("_match")) @@ -295,13 +295,13 @@ public class RequestBypassToServer implements IClientIncomingPacket } else { - LOGGER.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); + PacketLogger.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); } } } catch (Exception e) { - LOGGER.log(Level.WARNING, "Exception processing bypass from player " + player.getName() + ": " + _command, e); + PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _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/RequestCrystallizeItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index f3d775a15b..be08d7f35d 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -59,7 +60,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.finer("RequestCrystalizeItem: activeChar was null"); + // PacketLogger.finer("RequestCrystalizeItem: activeChar was null."); return; } @@ -87,7 +88,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - LOGGER.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 4f351a636b..cb90d581c8 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; @@ -33,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -169,7 +169,7 @@ public class RequestDestroyItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not delete pet objectid: ", e); + PacketLogger.warning("Could not delete pet objectid: " + e.getMessage()); } } if (itemToRemove.isTimeLimitedItem()) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 0e4b623bb3..b7d4ac63a9 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.GMAudit; import org.l2jmobius.gameserver.util.Util; @@ -210,7 +211,7 @@ public class RequestDropItem implements IClientIncomingPacket if ((dropedItem != null) && (dropedItem.getId() == Inventory.ADENA_ID) && (dropedItem.getCount() >= 1000000)) { final String msg = "Character (" + player.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")"; - LOGGER.warning(msg); + PacketLogger.warning(msg); AdminData.getInstance().broadcastMessageToGMs(msg); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java index e3ab837779..e8bfc249c9 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ExNeedToChangeName; /** @@ -42,6 +43,6 @@ public class RequestExChangeName implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); + PacketLogger.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java index 6e4861568e..c2f02f89ad 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chdd d: Arena d: Team @@ -74,7 +75,7 @@ public class RequestExCubeGameChangeTeam implements IClientIncomingPacket } default: { - LOGGER.warning("Wrong Cube Game Team ID: " + _team); + PacketLogger.warning("Wrong Cube Game Team ID: " + _team); break; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java index 009b836b6d..d72fdfc413 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chddd d: Arena d: Answer @@ -64,7 +65,7 @@ public class RequestExCubeGameReadyAnswer implements IClientIncomingPacket } default: { - LOGGER.warning("Unknown Cube Game Answer ID: " + _answer); + PacketLogger.warning("Unknown Cube Game Answer ID: " + _answer); break; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java index ff12adb20d..3347f01941 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) just a trigger @@ -34,6 +35,6 @@ public class RequestExFishRanking implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestExFishRanking"); + PacketLogger.info("C5: RequestExFishRanking"); } } \ No newline at end of file diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 57e8e7d2e5..8851aef463 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; import org.l2jmobius.gameserver.util.Broadcast; @@ -86,7 +87,7 @@ public class RequestExMagicSkillUseGround implements IClientIncomingPacket else { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("No skill found with id " + _skillId + " and level " + level + " !!"); + PacketLogger.warning("No skill found with id " + _skillId + " and level " + level + " !!"); } } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 77093c5f2d..2d9f0456f4 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; @@ -73,7 +74,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket client.sendPacket(new ExPutEnchantTargetItemResult(0)); if (scrollTemplate == null) { - LOGGER.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); + PacketLogger.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); } return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java index 05e09e6dfc..0a4522bf64 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressMapInfo; @@ -43,7 +44,7 @@ public class RequestFortressMapInfo implements IClientIncomingPacket final Fort fort = FortManager.getInstance().getFortById(_fortressId); if (fort == null) { - LOGGER.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); + PacketLogger.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); if (client.getPlayer() == null) { 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 f65a63d325..dc903790d0 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 @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) d @@ -44,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - LOGGER.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning("Player " + 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/RequestGetItemFromPet.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index a9fd8d923a..48e75fc61b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.util.Util; @@ -84,7 +85,7 @@ public class RequestGetItemFromPet implements IClientIncomingPacket } else { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 79e1193ac0..22f2f24422 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.util.Util; @@ -124,7 +125,7 @@ public class RequestGiveItemToPet implements IClientIncomingPacket } else { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } 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 eab1e325f5..04b9115f3d 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 @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaEquipList; @@ -60,7 +61,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.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 fa21b68043..a7c019d65d 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; @@ -52,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - LOGGER.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); } client.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 b943775334..ff96a400c9 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; @@ -50,10 +51,11 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.sendPacket(ActionFailed.STATIC_PACKET); return; } + player.sendPacket(new HennaItemRemoveInfo(henna, player)); } } 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 70e2f43664..2e95a321ee 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -75,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); client.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 53f04488a6..ada67e190c 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -49,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - LOGGER.warning("Player " + actor.getName() + " sent empty html link!"); + PacketLogger.warning("Player " + actor.getName() + " sent empty html link!"); return; } if (_link.contains("..")) { - LOGGER.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); return; } final int htmlObjectId = actor.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - LOGGER.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java index 89adeae67b..2e1c1c83f6 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author UnAfraid @@ -51,7 +52,7 @@ public class RequestMagicSkillList implements IClientIncomingPacket if (player.getObjectId() != _objectId) { - LOGGER.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); + PacketLogger.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 9432941937..a228079092 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -64,7 +64,7 @@ public class RequestMagicSkillUse implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); // if (_magicId > 0) // { - // LOGGER.warning("Skill Id " + _magicId + " not found in player: " + player); + // PacketLogger.warning("Skill Id " + _magicId + " not found in player: " + player); // } return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index ec42bd4ca4..58405174cd 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListDelete; @@ -71,7 +72,7 @@ public class RequestOustPledgeMember implements IClientIncomingPacket final ClanMember member = clan.getClanMember(_target); if (member == null) { - LOGGER.warning("Target (" + _target + ") is not member of the clan"); + PacketLogger.warning("Target (" + _target + ") is not member of the clan"); return; } if (member.isOnline() && member.getPlayer().isInCombat()) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java index 9702554c3b..209835b319 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) S @@ -37,6 +38,6 @@ public class RequestPCCafeCouponUse implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestPCCafeCouponUse: S: " + _str); + PacketLogger.info("C5: RequestPCCafeCouponUse: S: " + _str); } } 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 7da966ce9f..2cd9c6a8d1 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 @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -120,7 +121,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item item = player.checkItemManipulation(i.getId(), i.getCount(), "freight"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); warehouse.deleteMe(); return; } @@ -169,7 +170,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); warehouse.deleteMe(); return; } @@ -177,7 +178,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem("Trade", i.getId(), i.getCount(), warehouse, player, null); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 2c715b4efb..0d858fb452 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -137,7 +138,7 @@ public class RequestPetUseItem implements IClientIncomingPacket else { player.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM); - LOGGER.warning("No item handler registered for itemId: " + item.getId()); + PacketLogger.warning("No item handler registered for itemId: " + item.getId()); } } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index 8ece2b3ec7..fec0dc36a0 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -25,6 +25,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Plim @@ -74,7 +75,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket } catch (SQLException e) { - LOGGER.severe("Error while saving petition feedback"); + PacketLogger.warning("Error while saving petition feedback."); } } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java index d212481717..3459b04c80 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java @@ -44,8 +44,8 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket @Override public void run(GameClient client) { - // LOGGER.info("C5: RequestPledgeMemberInfo d:"+_unk1); - // LOGGER.info("C5: RequestPledgeMemberInfo S:"+_player); + // PacketLogger.info("C5: RequestPledgeMemberInfo d:"+_unk1); + // PacketLogger.info("C5: RequestPledgeMemberInfo S:"+_player); final Player player = client.getPlayer(); if (player == null) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index e56c105cf4..44bbd9d34c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.HashMap; import java.util.Map; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -38,6 +37,7 @@ import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; @@ -74,7 +74,7 @@ public class RequestPreviewItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } @@ -152,7 +152,7 @@ public class RequestPreviewItem implements IClientIncomingPacket final Merchant merchant = (target instanceof Merchant) ? (Merchant) target : null; if (merchant == null) { - LOGGER.warning("Null merchant!"); + PacketLogger.warning(getClass().getSimpleName() + ": Null merchant!"); 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 251757c0ba..94958bc4fe 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.util.Util; @@ -145,7 +146,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if (result > 1) { - LOGGER.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); } return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java index 9998465898..8ab3d4962f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; public class RequestPrivateStoreSell implements IClientIncomingPacket @@ -134,7 +135,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket if (!storeList.privateStoreSell(player, _items)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index a4010ca2cb..1632df189f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -193,7 +194,7 @@ public class RequestRefundItem implements IClientIncomingPacket final Item item = player.getRefund().transferItem("Refund", objectIds[i], Long.MAX_VALUE, player.getInventory(), player, player.getLastFolkNPC()); if (item == null) { - LOGGER.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index ee78579ea4..8a2f42272a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket { @@ -54,7 +55,7 @@ public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket } else { - LOGGER.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); + PacketLogger.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); } player.onTransactionRequest(requestor); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index afc4e65df4..08ad2c7763 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @version $Revision: 1.7.2.3.2.6 $ $Date: 2005/03/27 15:29:30 $ @@ -139,7 +140,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if ((player.getClan() == null) || (player.getClan().getHideoutId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.CLANHALL); @@ -167,7 +168,7 @@ public class RequestRestartPoint implements IClientIncomingPacket } else { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); return; } } @@ -199,7 +200,7 @@ public class RequestRestartPoint implements IClientIncomingPacket final Clan clan = player.getClan(); if ((clan == null) || (clan.getFortId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.FORTRESS); @@ -231,7 +232,7 @@ public class RequestRestartPoint implements IClientIncomingPacket if (((siegeClan == null) || siegeClan.getFlag().isEmpty())) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.SIEGEFLAG); @@ -241,7 +242,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if (!player.isGM() && !player.getInventory().haveItemForSelfResurrection()) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); return; } if (player.isGM() || player.destroyItemByItemId("Feather", 10649, 1, player, false) || player.destroyItemByItemId("Feather", 13300, 1, player, false) || player.destroyItemByItemId("Feather", 13128, 1, player, false)) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index ecb0ab9738..9f217064bb 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExNoticePostSent; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -316,14 +317,14 @@ public class RequestSendPost implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getObjectId(), i.getCount(), "attach"); if ((oldItem == null) || !oldItem.isTradeable() || oldItem.isEquipped()) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); return false; } final Item newItem = player.getInventory().transferItem("SendMail", i.getObjectId(), i.getCount(), attachments, player, msg.getReceiverName() + "[" + msg.getReceiverId() + "]"); if (newItem == null) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java index 2a33016c9a..b5d130046c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -54,16 +55,16 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket final Castle castle = CastleManager.getInstance().getCastleById(_castleId); if ((player == null) || (castle == null)) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); return; } if ((castle.getOwnerId() > 0) && (castle.getOwnerId() != player.getClanId())) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); } else if (!player.isClanLeader()) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); } else if (!castle.isTimeRegistrationOver()) { @@ -79,12 +80,12 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); } } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); } } 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 19a6780f98..04f5293545 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 @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; @@ -108,7 +109,7 @@ public class Say2 implements IClientIncomingPacket ChatType chatType = ChatType.findByClientId(_type); if (chatType == null) { - LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); + PacketLogger.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -116,7 +117,7 @@ public class Say2 implements IClientIncomingPacket if (_text.isEmpty()) { - LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); + PacketLogger.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -210,7 +211,7 @@ public class Say2 implements IClientIncomingPacket } else { - LOGGER.info("No handler registered for ChatType: " + _type + " Player: " + client); + PacketLogger.info("No handler registered for ChatType: " + _type + " Player: " + client); } } @@ -256,7 +257,7 @@ public class Say2 implements IClientIncomingPacket final Item item = owner.getInventory().getItemByObjectId(id); if (item == null) { - LOGGER.info(client + " trying publish item which doesnt own! ID:" + id); + PacketLogger.info(client + " trying publish item which doesnt own! ID:" + id); return false; } item.publish(); @@ -264,7 +265,7 @@ public class Say2 implements IClientIncomingPacket pos1 = _text.indexOf(8, pos) + 1; if (pos1 == 0) // missing ending tag { - LOGGER.info(client + " sent invalid publish item msg! ID:" + id); + PacketLogger.info(client + " sent invalid publish item msg! ID:" + id); return false; } } 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 f89be1cfcb..84b879e0f7 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 @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -127,7 +128,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item item = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); return; } @@ -174,7 +175,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } @@ -186,7 +187,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem(warehouse.getName(), itemHolder.getId(), itemHolder.getCount(), warehouse, player, manager); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 1840fcded7..647761584a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; @@ -163,13 +164,13 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket final Item oldItem = warehouse.getItemByObjectId(i.getId()); if ((oldItem == null) || (oldItem.getCount() < i.getCount())) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } final Item newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, manager); if (newItem == null) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); return; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 74f5736cf7..5bf5b6bcff 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -43,6 +43,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUseSharedGroupItem; @@ -280,7 +281,7 @@ public class UseItem implements IClientIncomingPacket { if ((etcItem != null) && (etcItem.getHandlerName() != null)) { - LOGGER.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); + PacketLogger.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); } } else if (handler.useItem(player, item, _ctrlPressed)) 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 36f9206cb0..ece66b1cd9 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -56,12 +57,12 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final SkillHolder holder = new SkillHolder(packet.readD(), packet.readD()); if (holder.getSkillLevel() < 1) { - LOGGER.warning("Player " + client + " is trying to learn skill " + holder + " by sending packet with level 0!"); + PacketLogger.warning("Player " + client + " is trying to learn skill " + holder + " by sending packet with level 0!"); return false; } if (_skills.putIfAbsent(holder.getSkillId(), holder) != null) { - LOGGER.warning("Player " + client + " is trying to send two times one skill " + holder + " to learn!"); + PacketLogger.warning("Player " + client + " is trying to send two times one skill " + holder + " to learn!"); return false; } } @@ -85,7 +86,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket if ((player.getAbilityPoints() == 0) || (player.getAbilityPoints() == player.getAbilityPointsUsed())) { - LOGGER.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); return; } @@ -114,7 +115,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final SkillLearn learn = SkillTreeData.getInstance().getAbilitySkill(holder.getSkillId(), holder.getSkillLevel()); if (learn == null) { - LOGGER.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); + PacketLogger.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); client.sendPacket(ActionFailed.STATIC_PACKET); break; } @@ -122,7 +123,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final Skill skill = holder.getSkill(); if (skill == null) { - LOGGER.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); + PacketLogger.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); client.sendPacket(ActionFailed.STATIC_PACKET); break; } @@ -155,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]) { - LOGGER.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!"); + PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -165,7 +166,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket { if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel()) { - LOGGER.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); + PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -174,7 +175,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 3 Learning a skill without having enough points if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points) { - LOGGER.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java index 964fffd4a3..348dc87199 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -98,13 +99,13 @@ public class RequestAlchemyConversion implements IClientIncomingPacket if (data == null) { player.sendPacket(new ExAlchemyConversion(0, 0)); - LOGGER.warning("Missing AlchemyData for skillId: " + _skillId + ", skillLevel: " + _skillLevel); + PacketLogger.warning("Missing AlchemyData for skillId: " + _skillId + ", skillLevel: " + _skillLevel); return; } // if (!_ingredients.equals(data.getIngredients())) // { - // LOGGER.warning("Client ingredients are not same as server ingredients for alchemy conversion player: "+ +"", player); + // PacketLogger.warning("Client ingredients are not same as server ingredients for alchemy conversion player: "+ +"", player); // return; // } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index 68da085e66..a36649b520 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -74,7 +75,7 @@ public class RequestAlchemyTryMixCube implements IClientIncomingPacket else // Player used packet injection tool. { final Player player = client.getPlayer(); - LOGGER.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName()); + PacketLogger.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName()); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return false; } 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 20d84a2bd6..6b2f96e87d 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; @@ -60,37 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - LOGGER.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 30% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 100% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - LOGGER.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - - LOGGER.warning("Player " + player + ": Auction House (15-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); return; - } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - LOGGER.warning("Player " + player + ": Auction House (30-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + 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/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index b4b5bd9011..e4e46a5271 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -94,7 +95,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning(player + ": tried to crystallize " + item.getItem()); + PacketLogger.warning(player + ": tried to crystallize " + item.getItem()); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index 6a17e5856a..1465b00631 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets.ensoul; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnsoulData; import org.l2jmobius.gameserver.enums.PrivateStoreType; @@ -28,6 +26,7 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -39,7 +38,6 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; */ public class RequestItemEnsoul implements IClientIncomingPacket { - private static final Logger LOGGER = Logger.getLogger(RequestItemEnsoul.class.getName()); private int _itemObjectId; private EnsoulItemOption[] _options; @@ -119,37 +117,37 @@ public class RequestItemEnsoul implements IClientIncomingPacket final Item item = player.getInventory().getItemByObjectId(_itemObjectId); if (item == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item without having it!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item without having it!"); return; } if (!item.isEquipable()) { - LOGGER.warning("Player: " + player + " attempting to ensoul non equippable item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul non equippable item: " + item + "!"); return; } if (!item.isWeapon()) { - LOGGER.warning("Player: " + player + " attempting to ensoul item that's not a weapon: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item that's not a weapon: " + item + "!"); return; } if (item.isCommonItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul common item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul common item: " + item + "!"); return; } if (item.isShadowItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul shadow item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul shadow item: " + item + "!"); return; } if (item.isHeroItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul hero item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul hero item: " + item + "!"); return; } if ((_options == null) || (_options.length == 0)) { - LOGGER.warning("Player: " + player + " attempting to ensoul item without any special ability declared!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item without any special ability declared!"); return; } @@ -173,14 +171,14 @@ public class RequestItemEnsoul implements IClientIncomingPacket if (!stone.getOptions().contains(itemOption.getSoulCrystalOption())) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that stone doesn't contains!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that stone doesn't contains!"); continue; } final EnsoulOption option = EnsoulData.getInstance().getOption(itemOption.getSoulCrystalOption()); if (option == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that doesn't exists!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that doesn't exists!"); continue; } @@ -205,13 +203,13 @@ public class RequestItemEnsoul implements IClientIncomingPacket } else { - LOGGER.warning("Player: " + player + " attempting to ensoul item option with unhandled type: " + itemOption.getType() + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option with unhandled type: " + itemOption.getType() + "!"); continue; } if (fee == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that doesn't exists! (unknown fee)"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that doesn't exists! (unknown fee)"); continue; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java index 3f29f579da..11b1da5ff3 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java @@ -18,12 +18,12 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -102,7 +102,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e); + PacketLogger.warning("Could not add friend objectid: " + e.getMessage()); } } else diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java index 99fc483839..01307e7a6d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -26,6 +25,7 @@ import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -99,7 +99,7 @@ public class RequestFriendDel implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not del friend objectid: ", e); + PacketLogger.warning("Could not del friend objectid: " + e.getMessage()); } } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index 8a327f1f9c..ff61b200fb 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.mentoring; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMenteeAdd; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -93,7 +93,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, e.getMessage(), e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index 41700d0f61..39121a166d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; @@ -56,7 +57,7 @@ public class RequestExPledgeMissionReward implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { - LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); + PacketLogger.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java index ee8910d06e..a53878b794 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductList; @@ -60,7 +61,7 @@ public class RequestBRProductList implements IClientIncomingPacket } default: { - LOGGER.warning(player + " send unhandled product list type: " + _type); + PacketLogger.warning(player + " send unhandled product list type: " + _type); break; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java index e83bf335a7..a828073bb9 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.SayuneRequest; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.type.SayuneZone; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; @@ -72,7 +73,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (zone.getMapId() == -1) { player.sendMessage("That zone is not supported yet!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); return; } @@ -80,7 +81,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (map == null) { player.sendMessage("This zone is not handled yet!!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); return; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java index f1ede4ef0a..41648f184f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Shuttle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -60,7 +61,7 @@ public class RequestShuttleGetOn implements IClientIncomingPacket player.getInVehiclePosition().setXYZ(_x, _y, _z); break; } - LOGGER.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); + PacketLogger.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); } } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 33eeff5060..1b8ddb2042 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -16,11 +16,10 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Level; - import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.util.Util; /** @@ -75,7 +74,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { if (html.length() > 17200) { - LOGGER.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable()); + PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } @@ -94,7 +93,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket if (content == null) { setHtml("My Text is missing:
" + path + ""); - LOGGER.warning("missing html page " + path); + PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index e6b4b8b604..57ed88ac29 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; /** @@ -46,7 +47,7 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index d94dbf4403..75f6596194 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Migi, DS @@ -44,7 +45,7 @@ public class ExReplySentPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index b0f3738683..15d011befc 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author KenM @@ -54,7 +55,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); + PacketLogger.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); packet.writeS(""); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index d588f1c7cf..b5c8628b50 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IOutgoingPacket; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; @@ -28,8 +26,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; */ public interface IClientOutgoingPacket extends IOutgoingPacket { - Logger LOGGER = Logger.getLogger(IClientOutgoingPacket.class.getName()); - int[] PAPERDOLL_ORDER = new int[] { Inventory.PAPERDOLL_UNDER, diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 29a4f31530..79d478aff9 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan.SubPledge; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author -Wooden- @@ -56,7 +57,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket } else if (_clan.getClanMember(LeaderId) == null) { - LOGGER.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); + PacketLogger.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); return ""; } else diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index a95e7ab97c..d9c2621c84 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.RecipeData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.RecipeHolder; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class RecipeItemMakeInfo implements IClientOutgoingPacket { @@ -77,7 +78,8 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeQ(_offeringMaximumAdena); // Adena worth of items for maximum offering. return true; } - LOGGER.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); + + PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 432ff8ad7f..0a3fe46cb7 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Shows the Siege Info
@@ -78,7 +79,7 @@ public class SiegeInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Null owner for castle: " + _castle.getName()); + PacketLogger.warning("Null owner for castle: " + _castle.getName()); } } else diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 44f290e92f..746b2da3f7 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; @@ -157,7 +158,7 @@ public class SystemMessage implements IClientOutgoingPacket // Mobius: With additional on-screen damage param (popup), length is increased. if (param.getType() != TYPE_POPUP_ID) { - LOGGER.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); + PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } @@ -414,7 +415,7 @@ public class SystemMessage implements IClientOutgoingPacket { if (param == null) { - LOGGER.warning("Found null parameter for SystemMessageId " + _smId); + PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 37150ec357..7af1cd273c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -24,6 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class WareHouseWithdrawalList extends AbstractItemPacket { @@ -56,7 +57,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket _invSize = player.getInventory().getSize(); if (_player.getActiveWarehouse() == null) { - LOGGER.warning("error while sending withdraw request to: " + _player.getName()); + PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/PacketLogger.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/PacketLogger.java new file mode 100644 index 0000000000..5b5a083a99 --- /dev/null +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/PacketLogger.java @@ -0,0 +1,42 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.network; + +import java.util.logging.Logger; + +/** + * @author Mobius + */ +public class PacketLogger +{ + private static final Logger LOGGER = Logger.getLogger(PacketLogger.class.getName()); + + public static synchronized void warning(String message) + { + LOGGER.warning(message); + } + + public static synchronized void info(String message) + { + LOGGER.info(message); + } + + public static synchronized void finer(String message) + { + LOGGER.finer(message); + } +} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 7c343f78be..ef3f4acc18 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -161,7 +162,7 @@ public class Action implements IClientIncomingPacket default: { // Invalid action detected (probably client cheating), log this - LOGGER.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); + PacketLogger.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); client.sendPacket(ActionFailed.STATIC_PACKET); break; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index 31d29ef3dd..8e8ae2c190 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; import org.l2jmobius.gameserver.network.serverpackets.TradeOwnAdd; @@ -58,7 +59,7 @@ public class AddTradeItem implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - LOGGER.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); + PacketLogger.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); return; } @@ -68,7 +69,7 @@ public class AddTradeItem implements IClientIncomingPacket // Trade partner not found, cancel trade if (partner != null) { - LOGGER.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); + PacketLogger.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); } player.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE); player.cancelActiveTrade(); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 20134dd2bb..a3236b0d83 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -62,7 +62,7 @@ public class CannotMoveAnymore implements IClientIncomingPacket // player.stopMove(); // // if (Config.DEBUG) - // LOGGER.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ + // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); // StopMove smwl = new StopMove(player); // client.getPlayer().sendPacket(smwl); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index a91ba39468..a6c619cf46 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -46,6 +46,7 @@ import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; import org.l2jmobius.gameserver.network.serverpackets.CharCreateOk; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -127,21 +128,21 @@ public class CharacterCreate implements IClientIncomingPacket if ((_face > 2) || (_face < 0)) { - LOGGER.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairStyle < 0) || ((_sex == 0) && (_hairStyle > 4)) || ((_sex != 0) && (_hairStyle > 6))) { - LOGGER.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairColor > 3) || (_hairColor < 0)) { - LOGGER.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } @@ -345,7 +346,7 @@ public class CharacterCreate implements IClientIncomingPacket final Item item = newChar.getInventory().addItem("Init", ie.getId(), ie.getCount(), newChar, null); if (item == null) { - LOGGER.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); + PacketLogger.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); continue; } @@ -362,7 +363,7 @@ public class CharacterCreate implements IClientIncomingPacket final Item item = newChar.getInventory().addItem("Balthus Rewards", reward.getId(), reward.getCount(), newChar, null); if (item == null) { - LOGGER.warning("Could not create item during char creation: itemId " + reward.getId() + ", amount " + reward.getCount() + "."); + PacketLogger.warning("Could not create item during char creation: itemId " + reward.getId() + ", amount " + reward.getCount() + "."); continue; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java index 86c425fa45..63c3261946 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Level; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.CharacterDeleteFailType; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -25,6 +23,7 @@ import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDelete; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteFail; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteSuccess; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -74,7 +73,7 @@ public class CharacterDelete implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Error:", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1, 0); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java index 5f74c38273..cfe9b20f3d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java @@ -47,7 +47,7 @@ public class EndScenePlayer implements IClientIncomingPacket final MovieHolder holder = player.getMovieHolder(); if ((holder == null) || (holder.getMovie().getClientId() != _movieId)) { - // LOGGER.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); + // PacketLogger.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 1dccd31130..0503ced388 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -69,6 +69,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.Die; @@ -153,7 +154,7 @@ public class EnterWorld implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.warning("EnterWorld failed! player returned 'null'."); + PacketLogger.warning("EnterWorld failed! player returned 'null'."); Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java index 8bde20da0a..14e8153478 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java @@ -25,9 +25,13 @@ import org.l2jmobius.gameserver.network.GameClient; */ public class ExGetOnAirShip implements IClientIncomingPacket { + @SuppressWarnings("unused") private int _x; + @SuppressWarnings("unused") private int _y; + @SuppressWarnings("unused") private int _z; + @SuppressWarnings("unused") private int _shipId; @Override @@ -43,9 +47,9 @@ public class ExGetOnAirShip implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("[T1:ExGetOnAirShip] x: " + _x); - LOGGER.info("[T1:ExGetOnAirShip] y: " + _y); - LOGGER.info("[T1:ExGetOnAirShip] z: " + _z); - LOGGER.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); + // PacketLogger.info("[T1:ExGetOnAirShip] x: " + _x); + // PacketLogger.info("[T1:ExGetOnAirShip] y: " + _y); + // PacketLogger.info("[T1:ExGetOnAirShip] z: " + _z); + // PacketLogger.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ExRequestTeleport.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ExRequestTeleport.java index 4f55fcd8c5..3edc500d60 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ExRequestTeleport.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ExRequestTeleport.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.holders.TeleportListHolder; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; /** @@ -54,7 +55,7 @@ public class ExRequestTeleport implements IClientIncomingPacket final TeleportListHolder teleport = TeleportListData.getInstance().getTeleport(_teleportId); if (teleport == null) { - LOGGER.warning("No registered teleport location for id: " + _teleportId); + PacketLogger.warning("No registered teleport location for id: " + _teleportId); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java index fcdd8335f4..4e91188f5c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java @@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Arrays; -import java.util.logging.Level; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: c dddd @@ -79,7 +79,7 @@ public class GameGuardReply implements IClientIncomingPacket } catch (NoSuchAlgorithmException e) { - LOGGER.log(Level.WARNING, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java index eddff9f891..62e69acd86 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.gameserver.network.GameClient; @@ -27,5 +25,4 @@ import org.l2jmobius.gameserver.network.GameClient; */ public interface IClientIncomingPacket extends IIncomingPacket { - Logger LOGGER = Logger.getLogger(IClientIncomingPacket.class.getName()); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index ea86074f0e..91a2b46047 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -153,7 +154,7 @@ public class MultiSellChoose implements IClientIncomingPacket if (((_soulCrystalOptions != null) && CommonUtil.contains(_soulCrystalOptions, null)) || ((_soulCrystalSpecialOptions != null) && CommonUtil.contains(_soulCrystalSpecialOptions, null))) { - LOGGER.severe("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -161,14 +162,14 @@ public class MultiSellChoose implements IClientIncomingPacket final MultisellEntryHolder entry = list.getEntries().get(_entryId - 1); // Entry Id begins from 1. We currently use entry IDs as index pointer. if (entry == null) { - LOGGER.severe("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } if (!entry.isStackable() && (_amount > 1)) { - LOGGER.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -196,7 +197,7 @@ public class MultiSellChoose implements IClientIncomingPacket )) //@formatter:on { - LOGGER.severe("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -368,7 +369,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); return; } } @@ -478,7 +479,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); return; } } @@ -673,7 +674,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); + PacketLogger.warning("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); return false; } } 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 f778c388f5..0c9ba62406 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 @@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillDone; import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; @@ -104,7 +105,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if ((_level < 1) || (_level > 1000) || (_id < 1) || (_id > 64000)) { Util.handleIllegalPlayerAction(player, "Wrong Packet Data in Aquired Skill", Config.DEFAULT_PUNISH); - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); return; } @@ -118,7 +119,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - LOGGER.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -450,7 +451,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket } default: { - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); break; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 0a570fd3ef..4bb789645a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillInfo; import org.l2jmobius.gameserver.network.serverpackets.ExAcquireSkillInfo; @@ -55,7 +56,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket { if ((_id <= 0) || (_level <= 0)) { - LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); return; } @@ -74,7 +75,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level); if (skill == null) { - LOGGER.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); + PacketLogger.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); return; } 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 5e0a2af0c9..8078d0c10e 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.Arrays; -import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.ActionData; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; @@ -41,8 +41,6 @@ import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList; */ public class RequestActionUse implements IClientIncomingPacket { - private static final Logger LOGGER = Logger.getLogger(RequestActionUse.class.getName()); - private int _actionId; private boolean _ctrlPressed; private boolean _shiftPressed; @@ -93,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } @@ -107,7 +105,7 @@ public class RequestActionUse implements IClientIncomingPacket actionHandler.useAction(player, actionHolder, _ctrlPressed, _shiftPressed); return; } - LOGGER.warning("Couldnt find handler with name: " + actionHolder.getHandler()); + PacketLogger.warning("Couldn't find handler with name: " + actionHolder.getHandler()); return; } @@ -143,7 +141,7 @@ public class RequestActionUse implements IClientIncomingPacket } default: { - LOGGER.warning(player.getName() + ": unhandled action type " + _actionId); + PacketLogger.warning(player.getName() + ": unhandled action type " + _actionId); break; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoUse.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoUse.java index 0729d6656c..f33a0c4567 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoUse.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoUse.java @@ -27,30 +27,30 @@ public class RequestAutoUse implements IClientIncomingPacket @Override public boolean read(GameClient client, PacketReader packet) { - final int unk1 = packet.readC(); // C - true. This is summary amount of next data received. - LOGGER.info("received packet RequestAutoUse with unk1:" + unk1); - final int unk2 = packet.readC(); - LOGGER.info("and unk2: " + unk2); - final int unk3 = packet.readC(); // Can target mobs, that attacked by other players? - LOGGER.info("and unk3: " + unk3); - final int unk4 = packet.readC(); // Auto pickup? - LOGGER.info("and unk4: " + unk4); - final int unk5 = packet.readC(); - LOGGER.info("and unk5: " + unk5); - final int unk6 = packet.readC(); - LOGGER.info("and unk6: " + unk6); - final int unk7 = packet.readC(); // short range :1; long: 0 - LOGGER.info("and unk7: " + unk7); - final int unk8 = packet.readC(); // received 51 when logged in game... - LOGGER.info("and unk8: " + unk8); - final int unk9 = packet.readC(); - LOGGER.info("and unk9: " + unk9); - final int unk10 = packet.readC(); - LOGGER.info("and unk10: " + unk10); - final int unk11 = packet.readC(); - LOGGER.info("and unk11: " + unk11); - final int unk12 = packet.readC(); // enable/ disable? - LOGGER.info("and unk12: " + unk12); + // final int unk1 = packet.readC(); // C - true. This is summary amount of next data received. + // PacketLogger.info("received packet RequestAutoUse with unk1:" + unk1); + // final int unk2 = packet.readC(); + // PacketLogger.info("and unk2: " + unk2); + // final int unk3 = packet.readC(); // Can target mobs, that attacked by other players? + // PacketLogger.info("and unk3: " + unk3); + // final int unk4 = packet.readC(); // Auto pickup? + // PacketLogger.info("and unk4: " + unk4); + // final int unk5 = packet.readC(); + // PacketLogger.info("and unk5: " + unk5); + // final int unk6 = packet.readC(); + // PacketLogger.info("and unk6: " + unk6); + // final int unk7 = packet.readC(); // short range :1; long: 0 + // PacketLogger.info("and unk7: " + unk7); + // final int unk8 = packet.readC(); // received 51 when logged in game... + // PacketLogger.info("and unk8: " + unk8); + // final int unk9 = packet.readC(); + // PacketLogger.info("and unk9: " + unk9); + // final int unk10 = packet.readC(); + // PacketLogger.info("and unk10: " + unk10); + // final int unk11 = packet.readC(); + // PacketLogger.info("and unk11: " + unk11); + // final int unk12 = packet.readC(); // enable/ disable? + // PacketLogger.info("and unk12: " + unk12); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java index 1fa1214bea..76649875f1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.data.xml.FakePlayerData; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -130,7 +131,7 @@ public class RequestBlock implements IClientIncomingPacket } default: { - LOGGER.info("Unknown 0xA9 block type: " + _type); + PacketLogger.info("Unknown 0xA9 block type: " + _type); } } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index eb7e62ebf2..ce3d851f06 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -161,7 +162,7 @@ public class RequestBuyItem implements IClientIncomingPacket long price = product.getPrice(); if (price < 0) { - LOGGER.warning("ERROR, no price found .. wrong buylist ??"); + PacketLogger.warning("ERROR, no price found .. wrong buylist ??"); client.sendPacket(ActionFailed.STATIC_PACKET); 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 47214311ac..4d8e55bc8e 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.StringTokenizer; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -43,6 +42,7 @@ import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -90,7 +90,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -194,7 +194,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (NumberFormatException nfe) { - LOGGER.log(Level.WARNING, "NFE for command [" + _command + "]", nfe); + PacketLogger.warning("NFE for command [" + _command + "] " + nfe.getMessage()); } } else if (_command.startsWith("_match")) @@ -295,13 +295,13 @@ public class RequestBypassToServer implements IClientIncomingPacket } else { - LOGGER.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); + PacketLogger.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); } } } catch (Exception e) { - LOGGER.log(Level.WARNING, "Exception processing bypass from player " + player.getName() + ": " + _command, e); + PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _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/RequestCrystallizeItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index c140d42b69..e0443b72b7 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -59,7 +60,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.finer("RequestCrystalizeItem: activeChar was null"); + // PacketLogger.finer("RequestCrystalizeItem: activeChar was null."); return; } @@ -87,7 +88,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - LOGGER.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 4f351a636b..cb90d581c8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; @@ -33,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -169,7 +169,7 @@ public class RequestDestroyItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not delete pet objectid: ", e); + PacketLogger.warning("Could not delete pet objectid: " + e.getMessage()); } } if (itemToRemove.isTimeLimitedItem()) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 0e4b623bb3..b7d4ac63a9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.GMAudit; import org.l2jmobius.gameserver.util.Util; @@ -210,7 +211,7 @@ public class RequestDropItem implements IClientIncomingPacket if ((dropedItem != null) && (dropedItem.getId() == Inventory.ADENA_ID) && (dropedItem.getCount() >= 1000000)) { final String msg = "Character (" + player.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")"; - LOGGER.warning(msg); + PacketLogger.warning(msg); AdminData.getInstance().broadcastMessageToGMs(msg); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java index e3ab837779..e8bfc249c9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ExNeedToChangeName; /** @@ -42,6 +43,6 @@ public class RequestExChangeName implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); + PacketLogger.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java index 6e4861568e..c2f02f89ad 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chdd d: Arena d: Team @@ -74,7 +75,7 @@ public class RequestExCubeGameChangeTeam implements IClientIncomingPacket } default: { - LOGGER.warning("Wrong Cube Game Team ID: " + _team); + PacketLogger.warning("Wrong Cube Game Team ID: " + _team); break; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java index 009b836b6d..d72fdfc413 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chddd d: Arena d: Answer @@ -64,7 +65,7 @@ public class RequestExCubeGameReadyAnswer implements IClientIncomingPacket } default: { - LOGGER.warning("Unknown Cube Game Answer ID: " + _answer); + PacketLogger.warning("Unknown Cube Game Answer ID: " + _answer); break; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java index ff12adb20d..3347f01941 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) just a trigger @@ -34,6 +35,6 @@ public class RequestExFishRanking implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestExFishRanking"); + PacketLogger.info("C5: RequestExFishRanking"); } } \ No newline at end of file diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 57e8e7d2e5..8851aef463 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; import org.l2jmobius.gameserver.util.Broadcast; @@ -86,7 +87,7 @@ public class RequestExMagicSkillUseGround implements IClientIncomingPacket else { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("No skill found with id " + _skillId + " and level " + level + " !!"); + PacketLogger.warning("No skill found with id " + _skillId + " and level " + level + " !!"); } } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 77093c5f2d..2d9f0456f4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; @@ -73,7 +74,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket client.sendPacket(new ExPutEnchantTargetItemResult(0)); if (scrollTemplate == null) { - LOGGER.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); + PacketLogger.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); } return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java index 05e09e6dfc..0a4522bf64 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressMapInfo; @@ -43,7 +44,7 @@ public class RequestFortressMapInfo implements IClientIncomingPacket final Fort fort = FortManager.getInstance().getFortById(_fortressId); if (fort == null) { - LOGGER.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); + PacketLogger.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); if (client.getPlayer() == null) { 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 f65a63d325..dc903790d0 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 @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) d @@ -44,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - LOGGER.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning("Player " + 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/RequestGetItemFromPet.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index a9fd8d923a..48e75fc61b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.util.Util; @@ -84,7 +85,7 @@ public class RequestGetItemFromPet implements IClientIncomingPacket } else { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 79e1193ac0..22f2f24422 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.util.Util; @@ -124,7 +125,7 @@ public class RequestGiveItemToPet implements IClientIncomingPacket } else { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } 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 5d9ff7b557..822c7231bc 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 @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaEquipList; @@ -60,7 +61,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.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 fa21b68043..a7c019d65d 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; @@ -52,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - LOGGER.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); } client.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 b943775334..ff96a400c9 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; @@ -50,10 +51,11 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.sendPacket(ActionFailed.STATIC_PACKET); return; } + player.sendPacket(new HennaItemRemoveInfo(henna, player)); } } 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 f511a8e30d..732efa0d71 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -76,7 +77,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); client.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 53f04488a6..ada67e190c 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -49,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - LOGGER.warning("Player " + actor.getName() + " sent empty html link!"); + PacketLogger.warning("Player " + actor.getName() + " sent empty html link!"); return; } if (_link.contains("..")) { - LOGGER.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); return; } final int htmlObjectId = actor.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - LOGGER.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java index 89adeae67b..2e1c1c83f6 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author UnAfraid @@ -51,7 +52,7 @@ public class RequestMagicSkillList implements IClientIncomingPacket if (player.getObjectId() != _objectId) { - LOGGER.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); + PacketLogger.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 9432941937..a228079092 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -64,7 +64,7 @@ public class RequestMagicSkillUse implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); // if (_magicId > 0) // { - // LOGGER.warning("Skill Id " + _magicId + " not found in player: " + player); + // PacketLogger.warning("Skill Id " + _magicId + " not found in player: " + player); // } return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 5fbcac0eca..9149ce1284 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListDelete; @@ -71,7 +72,7 @@ public class RequestOustPledgeMember implements IClientIncomingPacket final ClanMember member = clan.getClanMember(_target); if (member == null) { - LOGGER.warning("Target (" + _target + ") is not member of the clan"); + PacketLogger.warning("Target (" + _target + ") is not member of the clan"); return; } if (member.isOnline() && member.getPlayer().isInCombat()) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java index 9702554c3b..209835b319 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) S @@ -37,6 +38,6 @@ public class RequestPCCafeCouponUse implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestPCCafeCouponUse: S: " + _str); + PacketLogger.info("C5: RequestPCCafeCouponUse: S: " + _str); } } 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 7da966ce9f..2cd9c6a8d1 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 @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -120,7 +121,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item item = player.checkItemManipulation(i.getId(), i.getCount(), "freight"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); warehouse.deleteMe(); return; } @@ -169,7 +170,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); warehouse.deleteMe(); return; } @@ -177,7 +178,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem("Trade", i.getId(), i.getCount(), warehouse, player, null); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 2c715b4efb..0d858fb452 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -137,7 +138,7 @@ public class RequestPetUseItem implements IClientIncomingPacket else { player.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM); - LOGGER.warning("No item handler registered for itemId: " + item.getId()); + PacketLogger.warning("No item handler registered for itemId: " + item.getId()); } } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index 8ece2b3ec7..fec0dc36a0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -25,6 +25,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Plim @@ -74,7 +75,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket } catch (SQLException e) { - LOGGER.severe("Error while saving petition feedback"); + PacketLogger.warning("Error while saving petition feedback."); } } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java index d212481717..3459b04c80 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java @@ -44,8 +44,8 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket @Override public void run(GameClient client) { - // LOGGER.info("C5: RequestPledgeMemberInfo d:"+_unk1); - // LOGGER.info("C5: RequestPledgeMemberInfo S:"+_player); + // PacketLogger.info("C5: RequestPledgeMemberInfo d:"+_unk1); + // PacketLogger.info("C5: RequestPledgeMemberInfo S:"+_player); final Player player = client.getPlayer(); if (player == null) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index e56c105cf4..44bbd9d34c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.HashMap; import java.util.Map; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -38,6 +37,7 @@ import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; @@ -74,7 +74,7 @@ public class RequestPreviewItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } @@ -152,7 +152,7 @@ public class RequestPreviewItem implements IClientIncomingPacket final Merchant merchant = (target instanceof Merchant) ? (Merchant) target : null; if (merchant == null) { - LOGGER.warning("Null merchant!"); + PacketLogger.warning(getClass().getSimpleName() + ": Null merchant!"); 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 251757c0ba..94958bc4fe 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.util.Util; @@ -145,7 +146,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if (result > 1) { - LOGGER.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); } return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java index 9998465898..8ab3d4962f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; public class RequestPrivateStoreSell implements IClientIncomingPacket @@ -134,7 +135,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket if (!storeList.privateStoreSell(player, _items)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index a4010ca2cb..1632df189f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -193,7 +194,7 @@ public class RequestRefundItem implements IClientIncomingPacket final Item item = player.getRefund().transferItem("Refund", objectIds[i], Long.MAX_VALUE, player.getInventory(), player, player.getLastFolkNPC()); if (item == null) { - LOGGER.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index ee78579ea4..8a2f42272a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket { @@ -54,7 +55,7 @@ public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket } else { - LOGGER.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); + PacketLogger.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); } player.onTransactionRequest(requestor); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index afc4e65df4..08ad2c7763 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @version $Revision: 1.7.2.3.2.6 $ $Date: 2005/03/27 15:29:30 $ @@ -139,7 +140,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if ((player.getClan() == null) || (player.getClan().getHideoutId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.CLANHALL); @@ -167,7 +168,7 @@ public class RequestRestartPoint implements IClientIncomingPacket } else { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); return; } } @@ -199,7 +200,7 @@ public class RequestRestartPoint implements IClientIncomingPacket final Clan clan = player.getClan(); if ((clan == null) || (clan.getFortId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.FORTRESS); @@ -231,7 +232,7 @@ public class RequestRestartPoint implements IClientIncomingPacket if (((siegeClan == null) || siegeClan.getFlag().isEmpty())) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.SIEGEFLAG); @@ -241,7 +242,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if (!player.isGM() && !player.getInventory().haveItemForSelfResurrection()) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); return; } if (player.isGM() || player.destroyItemByItemId("Feather", 10649, 1, player, false) || player.destroyItemByItemId("Feather", 13300, 1, player, false) || player.destroyItemByItemId("Feather", 13128, 1, player, false)) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index cd8e900014..3582b308eb 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExNoticePostSent; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -316,14 +317,14 @@ public class RequestSendPost implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getObjectId(), i.getCount(), "attach"); if ((oldItem == null) || !oldItem.isTradeable() || oldItem.isEquipped()) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); return false; } final Item newItem = player.getInventory().transferItem("SendMail", i.getObjectId(), i.getCount(), attachments, player, msg.getReceiverName() + "[" + msg.getReceiverId() + "]"); if (newItem == null) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java index 2a33016c9a..b5d130046c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -54,16 +55,16 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket final Castle castle = CastleManager.getInstance().getCastleById(_castleId); if ((player == null) || (castle == null)) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); return; } if ((castle.getOwnerId() > 0) && (castle.getOwnerId() != player.getClanId())) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); } else if (!player.isClanLeader()) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); } else if (!castle.isTimeRegistrationOver()) { @@ -79,12 +80,12 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); } } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); } } 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 19a6780f98..04f5293545 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 @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; @@ -108,7 +109,7 @@ public class Say2 implements IClientIncomingPacket ChatType chatType = ChatType.findByClientId(_type); if (chatType == null) { - LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); + PacketLogger.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -116,7 +117,7 @@ public class Say2 implements IClientIncomingPacket if (_text.isEmpty()) { - LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); + PacketLogger.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -210,7 +211,7 @@ public class Say2 implements IClientIncomingPacket } else { - LOGGER.info("No handler registered for ChatType: " + _type + " Player: " + client); + PacketLogger.info("No handler registered for ChatType: " + _type + " Player: " + client); } } @@ -256,7 +257,7 @@ public class Say2 implements IClientIncomingPacket final Item item = owner.getInventory().getItemByObjectId(id); if (item == null) { - LOGGER.info(client + " trying publish item which doesnt own! ID:" + id); + PacketLogger.info(client + " trying publish item which doesnt own! ID:" + id); return false; } item.publish(); @@ -264,7 +265,7 @@ public class Say2 implements IClientIncomingPacket pos1 = _text.indexOf(8, pos) + 1; if (pos1 == 0) // missing ending tag { - LOGGER.info(client + " sent invalid publish item msg! ID:" + id); + PacketLogger.info(client + " sent invalid publish item msg! ID:" + id); return false; } } 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 f89be1cfcb..84b879e0f7 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 @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -127,7 +128,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item item = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); return; } @@ -174,7 +175,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } @@ -186,7 +187,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem(warehouse.getName(), itemHolder.getId(), itemHolder.getCount(), warehouse, player, manager); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 1840fcded7..647761584a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; @@ -163,13 +164,13 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket final Item oldItem = warehouse.getItemByObjectId(i.getId()); if ((oldItem == null) || (oldItem.getCount() < i.getCount())) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } final Item newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, manager); if (newItem == null) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); return; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 74f5736cf7..5bf5b6bcff 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -43,6 +43,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUseSharedGroupItem; @@ -280,7 +281,7 @@ public class UseItem implements IClientIncomingPacket { if ((etcItem != null) && (etcItem.getHandlerName() != null)) { - LOGGER.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); + PacketLogger.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); } } else if (handler.useItem(player, item, _ctrlPressed)) 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 36f9206cb0..ece66b1cd9 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -56,12 +57,12 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final SkillHolder holder = new SkillHolder(packet.readD(), packet.readD()); if (holder.getSkillLevel() < 1) { - LOGGER.warning("Player " + client + " is trying to learn skill " + holder + " by sending packet with level 0!"); + PacketLogger.warning("Player " + client + " is trying to learn skill " + holder + " by sending packet with level 0!"); return false; } if (_skills.putIfAbsent(holder.getSkillId(), holder) != null) { - LOGGER.warning("Player " + client + " is trying to send two times one skill " + holder + " to learn!"); + PacketLogger.warning("Player " + client + " is trying to send two times one skill " + holder + " to learn!"); return false; } } @@ -85,7 +86,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket if ((player.getAbilityPoints() == 0) || (player.getAbilityPoints() == player.getAbilityPointsUsed())) { - LOGGER.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); return; } @@ -114,7 +115,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final SkillLearn learn = SkillTreeData.getInstance().getAbilitySkill(holder.getSkillId(), holder.getSkillLevel()); if (learn == null) { - LOGGER.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); + PacketLogger.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); client.sendPacket(ActionFailed.STATIC_PACKET); break; } @@ -122,7 +123,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final Skill skill = holder.getSkill(); if (skill == null) { - LOGGER.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); + PacketLogger.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); client.sendPacket(ActionFailed.STATIC_PACKET); break; } @@ -155,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]) { - LOGGER.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!"); + PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -165,7 +166,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket { if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel()) { - LOGGER.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); + PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -174,7 +175,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 3 Learning a skill without having enough points if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points) { - LOGGER.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java index d9a7fcb4cb..d25abdb61e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -98,13 +99,13 @@ public class RequestAlchemyConversion implements IClientIncomingPacket if (data == null) { player.sendPacket(new ExAlchemyConversion(0, 0)); - LOGGER.warning("Missing AlchemyData for skillId: " + _skillId + ", skillLevel: " + _skillLevel); + PacketLogger.warning("Missing AlchemyData for skillId: " + _skillId + ", skillLevel: " + _skillLevel); return; } // if (!_ingredients.equals(data.getIngredients())) // { - // LOGGER.warning("Client ingredients are not same as server ingredients for alchemy conversion player: "+ +"", player); + // PacketLogger.warning("Client ingredients are not same as server ingredients for alchemy conversion player: "+ +"", player); // return; // } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index 68da085e66..a36649b520 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -74,7 +75,7 @@ public class RequestAlchemyTryMixCube implements IClientIncomingPacket else // Player used packet injection tool. { final Player player = client.getPlayer(); - LOGGER.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName()); + PacketLogger.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName()); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return false; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java index fe2532d455..3f79afe61c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.PlaySound; import org.l2jmobius.gameserver.network.serverpackets.classchange.ExRequestClassChangeUi; @@ -89,7 +90,7 @@ public class ExRequestClassChange implements IClientIncomingPacket if (!canChange // && (_classId != 170) && (player.getClassId().getId() != 133)) // Female Soul Hound fix. { - LOGGER.warning(player + " tried to change class from " + player.getClassId() + " to " + ClassId.getClassId(_classId) + "!"); + PacketLogger.warning(player + " tried to change class from " + player.getClassId() + " to " + ClassId.getClassId(_classId) + "!"); 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 20d84a2bd6..6b2f96e87d 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; @@ -60,37 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - LOGGER.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 30% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 100% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - LOGGER.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - - LOGGER.warning("Player " + player + ": Auction House (15-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); return; - } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - LOGGER.warning("Player " + player + ": Auction House (30-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + 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/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index e09225bec1..9d5edbda7a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -94,7 +95,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning(player + ": tried to crystallize " + item.getItem()); + PacketLogger.warning(player + ": tried to crystallize " + item.getItem()); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index 6a17e5856a..1465b00631 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets.ensoul; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnsoulData; import org.l2jmobius.gameserver.enums.PrivateStoreType; @@ -28,6 +26,7 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -39,7 +38,6 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; */ public class RequestItemEnsoul implements IClientIncomingPacket { - private static final Logger LOGGER = Logger.getLogger(RequestItemEnsoul.class.getName()); private int _itemObjectId; private EnsoulItemOption[] _options; @@ -119,37 +117,37 @@ public class RequestItemEnsoul implements IClientIncomingPacket final Item item = player.getInventory().getItemByObjectId(_itemObjectId); if (item == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item without having it!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item without having it!"); return; } if (!item.isEquipable()) { - LOGGER.warning("Player: " + player + " attempting to ensoul non equippable item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul non equippable item: " + item + "!"); return; } if (!item.isWeapon()) { - LOGGER.warning("Player: " + player + " attempting to ensoul item that's not a weapon: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item that's not a weapon: " + item + "!"); return; } if (item.isCommonItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul common item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul common item: " + item + "!"); return; } if (item.isShadowItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul shadow item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul shadow item: " + item + "!"); return; } if (item.isHeroItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul hero item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul hero item: " + item + "!"); return; } if ((_options == null) || (_options.length == 0)) { - LOGGER.warning("Player: " + player + " attempting to ensoul item without any special ability declared!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item without any special ability declared!"); return; } @@ -173,14 +171,14 @@ public class RequestItemEnsoul implements IClientIncomingPacket if (!stone.getOptions().contains(itemOption.getSoulCrystalOption())) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that stone doesn't contains!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that stone doesn't contains!"); continue; } final EnsoulOption option = EnsoulData.getInstance().getOption(itemOption.getSoulCrystalOption()); if (option == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that doesn't exists!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that doesn't exists!"); continue; } @@ -205,13 +203,13 @@ public class RequestItemEnsoul implements IClientIncomingPacket } else { - LOGGER.warning("Player: " + player + " attempting to ensoul item option with unhandled type: " + itemOption.getType() + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option with unhandled type: " + itemOption.getType() + "!"); continue; } if (fee == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that doesn't exists! (unknown fee)"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that doesn't exists! (unknown fee)"); continue; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java index b12c280c6d..635799d26b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java @@ -18,12 +18,12 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -102,7 +102,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e); + PacketLogger.warning("Could not add friend objectid: " + e.getMessage()); } } else diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java index 2dad174d89..73cd9a6a4b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -26,6 +25,7 @@ import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -99,7 +99,7 @@ public class RequestFriendDel implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not del friend objectid: ", e); + PacketLogger.warning("Could not del friend objectid: " + e.getMessage()); } } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index 8a327f1f9c..ff61b200fb 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.mentoring; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMenteeAdd; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -93,7 +93,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, e.getMessage(), e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index 41700d0f61..39121a166d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; @@ -56,7 +57,7 @@ public class RequestExPledgeMissionReward implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { - LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); + PacketLogger.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java index ee8910d06e..a53878b794 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductList; @@ -60,7 +61,7 @@ public class RequestBRProductList implements IClientIncomingPacket } default: { - LOGGER.warning(player + " send unhandled product list type: " + _type); + PacketLogger.warning(player + " send unhandled product list type: " + _type); break; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java index e83bf335a7..a828073bb9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.SayuneRequest; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.type.SayuneZone; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; @@ -72,7 +73,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (zone.getMapId() == -1) { player.sendMessage("That zone is not supported yet!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); return; } @@ -80,7 +81,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (map == null) { player.sendMessage("This zone is not handled yet!!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java index f1ede4ef0a..41648f184f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Shuttle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -60,7 +61,7 @@ public class RequestShuttleGetOn implements IClientIncomingPacket player.getInVehiclePosition().setXYZ(_x, _y, _z); break; } - LOGGER.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); + PacketLogger.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); } } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 33eeff5060..1b8ddb2042 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -16,11 +16,10 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Level; - import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.util.Util; /** @@ -75,7 +74,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { if (html.length() > 17200) { - LOGGER.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable()); + PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } @@ -94,7 +93,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket if (content == null) { setHtml("My Text is missing:
" + path + ""); - LOGGER.warning("missing html page " + path); + PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index e6b4b8b604..57ed88ac29 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; /** @@ -46,7 +47,7 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index d94dbf4403..75f6596194 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Migi, DS @@ -44,7 +45,7 @@ public class ExReplySentPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index b0f3738683..15d011befc 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author KenM @@ -54,7 +55,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); + PacketLogger.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); packet.writeS(""); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index d588f1c7cf..b5c8628b50 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IOutgoingPacket; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; @@ -28,8 +26,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; */ public interface IClientOutgoingPacket extends IOutgoingPacket { - Logger LOGGER = Logger.getLogger(IClientOutgoingPacket.class.getName()); - int[] PAPERDOLL_ORDER = new int[] { Inventory.PAPERDOLL_UNDER, diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 29a4f31530..79d478aff9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan.SubPledge; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author -Wooden- @@ -56,7 +57,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket } else if (_clan.getClanMember(LeaderId) == null) { - LOGGER.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); + PacketLogger.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); return ""; } else diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index a95e7ab97c..d9c2621c84 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.RecipeData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.RecipeHolder; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class RecipeItemMakeInfo implements IClientOutgoingPacket { @@ -77,7 +78,8 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeQ(_offeringMaximumAdena); // Adena worth of items for maximum offering. return true; } - LOGGER.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); + + PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 432ff8ad7f..0a3fe46cb7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Shows the Siege Info
@@ -78,7 +79,7 @@ public class SiegeInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Null owner for castle: " + _castle.getName()); + PacketLogger.warning("Null owner for castle: " + _castle.getName()); } } else diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 44f290e92f..746b2da3f7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; @@ -157,7 +158,7 @@ public class SystemMessage implements IClientOutgoingPacket // Mobius: With additional on-screen damage param (popup), length is increased. if (param.getType() != TYPE_POPUP_ID) { - LOGGER.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); + PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } @@ -414,7 +415,7 @@ public class SystemMessage implements IClientOutgoingPacket { if (param == null) { - LOGGER.warning("Found null parameter for SystemMessageId " + _smId); + PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 37150ec357..7af1cd273c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -24,6 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class WareHouseWithdrawalList extends AbstractItemPacket { @@ -56,7 +57,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket _invSize = player.getInventory().getSize(); if (_player.getActiveWarehouse() == null) { - LOGGER.warning("error while sending withdraw request to: " + _player.getName()); + PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java index 2cc486dc57..64c9f64e69 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.instancemanager.RankManager; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; /** @@ -152,7 +153,7 @@ public class ExOlympiadHeroAndLegendInfo implements IClientOutgoingPacket } catch (SQLException e) { - LOGGER.warning("Hero and Legend Info: Couldnt load data: " + e.getMessage()); + PacketLogger.warning("Hero and Legend Info: Couldnt load data: " + e.getMessage()); } } return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java index 61b1665ede..1806b92dad 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; /** @@ -98,7 +99,7 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket } catch (SQLException e) { - LOGGER.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); + PacketLogger.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); } int previousPlace = 0; @@ -127,7 +128,7 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket } catch (SQLException e) { - LOGGER.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); + PacketLogger.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); } int heroCount = 0; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/PacketLogger.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/PacketLogger.java new file mode 100644 index 0000000000..5b5a083a99 --- /dev/null +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/PacketLogger.java @@ -0,0 +1,42 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.network; + +import java.util.logging.Logger; + +/** + * @author Mobius + */ +public class PacketLogger +{ + private static final Logger LOGGER = Logger.getLogger(PacketLogger.class.getName()); + + public static synchronized void warning(String message) + { + LOGGER.warning(message); + } + + public static synchronized void info(String message) + { + LOGGER.info(message); + } + + public static synchronized void finer(String message) + { + LOGGER.finer(message); + } +} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 7c343f78be..ef3f4acc18 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -161,7 +162,7 @@ public class Action implements IClientIncomingPacket default: { // Invalid action detected (probably client cheating), log this - LOGGER.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); + PacketLogger.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); client.sendPacket(ActionFailed.STATIC_PACKET); break; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index 31d29ef3dd..8e8ae2c190 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; import org.l2jmobius.gameserver.network.serverpackets.TradeOwnAdd; @@ -58,7 +59,7 @@ public class AddTradeItem implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - LOGGER.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); + PacketLogger.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); return; } @@ -68,7 +69,7 @@ public class AddTradeItem implements IClientIncomingPacket // Trade partner not found, cancel trade if (partner != null) { - LOGGER.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); + PacketLogger.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); } player.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE); player.cancelActiveTrade(); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 20134dd2bb..a3236b0d83 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -62,7 +62,7 @@ public class CannotMoveAnymore implements IClientIncomingPacket // player.stopMove(); // // if (Config.DEBUG) - // LOGGER.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ + // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); // StopMove smwl = new StopMove(player); // client.getPlayer().sendPacket(smwl); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 1872b6fa54..2a1beff259 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -46,6 +46,7 @@ import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; import org.l2jmobius.gameserver.network.serverpackets.CharCreateOk; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -127,21 +128,21 @@ public class CharacterCreate implements IClientIncomingPacket if ((_face > 2) || (_face < 0)) { - LOGGER.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairStyle < 0) || ((_sex == 0) && (_hairStyle > 4)) || ((_sex != 0) && (_hairStyle > 6))) { - LOGGER.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairColor > 3) || (_hairColor < 0)) { - LOGGER.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } @@ -345,7 +346,7 @@ public class CharacterCreate implements IClientIncomingPacket final Item item = newChar.getInventory().addItem("Init", ie.getId(), ie.getCount(), newChar, null); if (item == null) { - LOGGER.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); + PacketLogger.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); continue; } @@ -362,7 +363,7 @@ public class CharacterCreate implements IClientIncomingPacket final Item item = newChar.getInventory().addItem("Balthus Rewards", reward.getId(), reward.getCount(), newChar, null); if (item == null) { - LOGGER.warning("Could not create item during char creation: itemId " + reward.getId() + ", amount " + reward.getCount() + "."); + PacketLogger.warning("Could not create item during char creation: itemId " + reward.getId() + ", amount " + reward.getCount() + "."); continue; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java index 86c425fa45..63c3261946 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Level; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.CharacterDeleteFailType; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -25,6 +23,7 @@ import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDelete; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteFail; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteSuccess; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -74,7 +73,7 @@ public class CharacterDelete implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Error:", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1, 0); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java index 5f74c38273..cfe9b20f3d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java @@ -47,7 +47,7 @@ public class EndScenePlayer implements IClientIncomingPacket final MovieHolder holder = player.getMovieHolder(); if ((holder == null) || (holder.getMovie().getClientId() != _movieId)) { - // LOGGER.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); + // PacketLogger.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index f5b68eaea4..fa829a9c4b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -71,6 +71,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.Die; @@ -158,7 +159,7 @@ public class EnterWorld implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.warning("EnterWorld failed! player returned 'null'."); + PacketLogger.warning("EnterWorld failed! player returned 'null'."); Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java index 8bde20da0a..14e8153478 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java @@ -25,9 +25,13 @@ import org.l2jmobius.gameserver.network.GameClient; */ public class ExGetOnAirShip implements IClientIncomingPacket { + @SuppressWarnings("unused") private int _x; + @SuppressWarnings("unused") private int _y; + @SuppressWarnings("unused") private int _z; + @SuppressWarnings("unused") private int _shipId; @Override @@ -43,9 +47,9 @@ public class ExGetOnAirShip implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("[T1:ExGetOnAirShip] x: " + _x); - LOGGER.info("[T1:ExGetOnAirShip] y: " + _y); - LOGGER.info("[T1:ExGetOnAirShip] z: " + _z); - LOGGER.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); + // PacketLogger.info("[T1:ExGetOnAirShip] x: " + _x); + // PacketLogger.info("[T1:ExGetOnAirShip] y: " + _y); + // PacketLogger.info("[T1:ExGetOnAirShip] z: " + _z); + // PacketLogger.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java index fcdd8335f4..4e91188f5c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java @@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Arrays; -import java.util.logging.Level; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: c dddd @@ -79,7 +79,7 @@ public class GameGuardReply implements IClientIncomingPacket } catch (NoSuchAlgorithmException e) { - LOGGER.log(Level.WARNING, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java index eddff9f891..62e69acd86 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.gameserver.network.GameClient; @@ -27,5 +25,4 @@ import org.l2jmobius.gameserver.network.GameClient; */ public interface IClientIncomingPacket extends IIncomingPacket { - Logger LOGGER = Logger.getLogger(IClientIncomingPacket.class.getName()); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index ea86074f0e..91a2b46047 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -153,7 +154,7 @@ public class MultiSellChoose implements IClientIncomingPacket if (((_soulCrystalOptions != null) && CommonUtil.contains(_soulCrystalOptions, null)) || ((_soulCrystalSpecialOptions != null) && CommonUtil.contains(_soulCrystalSpecialOptions, null))) { - LOGGER.severe("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -161,14 +162,14 @@ public class MultiSellChoose implements IClientIncomingPacket final MultisellEntryHolder entry = list.getEntries().get(_entryId - 1); // Entry Id begins from 1. We currently use entry IDs as index pointer. if (entry == null) { - LOGGER.severe("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } if (!entry.isStackable() && (_amount > 1)) { - LOGGER.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -196,7 +197,7 @@ public class MultiSellChoose implements IClientIncomingPacket )) //@formatter:on { - LOGGER.severe("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -368,7 +369,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); return; } } @@ -478,7 +479,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); return; } } @@ -673,7 +674,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); + PacketLogger.warning("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); return false; } } 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 f778c388f5..0c9ba62406 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 @@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillDone; import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; @@ -104,7 +105,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if ((_level < 1) || (_level > 1000) || (_id < 1) || (_id > 64000)) { Util.handleIllegalPlayerAction(player, "Wrong Packet Data in Aquired Skill", Config.DEFAULT_PUNISH); - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); return; } @@ -118,7 +119,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - LOGGER.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -450,7 +451,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket } default: { - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); break; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 0a570fd3ef..4bb789645a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillInfo; import org.l2jmobius.gameserver.network.serverpackets.ExAcquireSkillInfo; @@ -55,7 +56,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket { if ((_id <= 0) || (_level <= 0)) { - LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); return; } @@ -74,7 +75,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level); if (skill == null) { - LOGGER.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); + PacketLogger.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); return; } 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 5e0a2af0c9..8078d0c10e 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.Arrays; -import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.ActionData; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; @@ -41,8 +41,6 @@ import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList; */ public class RequestActionUse implements IClientIncomingPacket { - private static final Logger LOGGER = Logger.getLogger(RequestActionUse.class.getName()); - private int _actionId; private boolean _ctrlPressed; private boolean _shiftPressed; @@ -93,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } @@ -107,7 +105,7 @@ public class RequestActionUse implements IClientIncomingPacket actionHandler.useAction(player, actionHolder, _ctrlPressed, _shiftPressed); return; } - LOGGER.warning("Couldnt find handler with name: " + actionHolder.getHandler()); + PacketLogger.warning("Couldn't find handler with name: " + actionHolder.getHandler()); return; } @@ -143,7 +141,7 @@ public class RequestActionUse implements IClientIncomingPacket } default: { - LOGGER.warning(player.getName() + ": unhandled action type " + _actionId); + PacketLogger.warning(player.getName() + ": unhandled action type " + _actionId); break; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoUse.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoUse.java index 0729d6656c..f33a0c4567 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoUse.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoUse.java @@ -27,30 +27,30 @@ public class RequestAutoUse implements IClientIncomingPacket @Override public boolean read(GameClient client, PacketReader packet) { - final int unk1 = packet.readC(); // C - true. This is summary amount of next data received. - LOGGER.info("received packet RequestAutoUse with unk1:" + unk1); - final int unk2 = packet.readC(); - LOGGER.info("and unk2: " + unk2); - final int unk3 = packet.readC(); // Can target mobs, that attacked by other players? - LOGGER.info("and unk3: " + unk3); - final int unk4 = packet.readC(); // Auto pickup? - LOGGER.info("and unk4: " + unk4); - final int unk5 = packet.readC(); - LOGGER.info("and unk5: " + unk5); - final int unk6 = packet.readC(); - LOGGER.info("and unk6: " + unk6); - final int unk7 = packet.readC(); // short range :1; long: 0 - LOGGER.info("and unk7: " + unk7); - final int unk8 = packet.readC(); // received 51 when logged in game... - LOGGER.info("and unk8: " + unk8); - final int unk9 = packet.readC(); - LOGGER.info("and unk9: " + unk9); - final int unk10 = packet.readC(); - LOGGER.info("and unk10: " + unk10); - final int unk11 = packet.readC(); - LOGGER.info("and unk11: " + unk11); - final int unk12 = packet.readC(); // enable/ disable? - LOGGER.info("and unk12: " + unk12); + // final int unk1 = packet.readC(); // C - true. This is summary amount of next data received. + // PacketLogger.info("received packet RequestAutoUse with unk1:" + unk1); + // final int unk2 = packet.readC(); + // PacketLogger.info("and unk2: " + unk2); + // final int unk3 = packet.readC(); // Can target mobs, that attacked by other players? + // PacketLogger.info("and unk3: " + unk3); + // final int unk4 = packet.readC(); // Auto pickup? + // PacketLogger.info("and unk4: " + unk4); + // final int unk5 = packet.readC(); + // PacketLogger.info("and unk5: " + unk5); + // final int unk6 = packet.readC(); + // PacketLogger.info("and unk6: " + unk6); + // final int unk7 = packet.readC(); // short range :1; long: 0 + // PacketLogger.info("and unk7: " + unk7); + // final int unk8 = packet.readC(); // received 51 when logged in game... + // PacketLogger.info("and unk8: " + unk8); + // final int unk9 = packet.readC(); + // PacketLogger.info("and unk9: " + unk9); + // final int unk10 = packet.readC(); + // PacketLogger.info("and unk10: " + unk10); + // final int unk11 = packet.readC(); + // PacketLogger.info("and unk11: " + unk11); + // final int unk12 = packet.readC(); // enable/ disable? + // PacketLogger.info("and unk12: " + unk12); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java index 1fa1214bea..76649875f1 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.data.xml.FakePlayerData; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -130,7 +131,7 @@ public class RequestBlock implements IClientIncomingPacket } default: { - LOGGER.info("Unknown 0xA9 block type: " + _type); + PacketLogger.info("Unknown 0xA9 block type: " + _type); } } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index eb7e62ebf2..ce3d851f06 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -161,7 +162,7 @@ public class RequestBuyItem implements IClientIncomingPacket long price = product.getPrice(); if (price < 0) { - LOGGER.warning("ERROR, no price found .. wrong buylist ??"); + PacketLogger.warning("ERROR, no price found .. wrong buylist ??"); client.sendPacket(ActionFailed.STATIC_PACKET); 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 47214311ac..4d8e55bc8e 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.StringTokenizer; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -43,6 +42,7 @@ import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -90,7 +90,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -194,7 +194,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (NumberFormatException nfe) { - LOGGER.log(Level.WARNING, "NFE for command [" + _command + "]", nfe); + PacketLogger.warning("NFE for command [" + _command + "] " + nfe.getMessage()); } } else if (_command.startsWith("_match")) @@ -295,13 +295,13 @@ public class RequestBypassToServer implements IClientIncomingPacket } else { - LOGGER.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); + PacketLogger.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); } } } catch (Exception e) { - LOGGER.log(Level.WARNING, "Exception processing bypass from player " + player.getName() + ": " + _command, e); + PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _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/RequestCrystallizeItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index c140d42b69..e0443b72b7 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -59,7 +60,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.finer("RequestCrystalizeItem: activeChar was null"); + // PacketLogger.finer("RequestCrystalizeItem: activeChar was null."); return; } @@ -87,7 +88,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - LOGGER.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 4f351a636b..cb90d581c8 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; @@ -33,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -169,7 +169,7 @@ public class RequestDestroyItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not delete pet objectid: ", e); + PacketLogger.warning("Could not delete pet objectid: " + e.getMessage()); } } if (itemToRemove.isTimeLimitedItem()) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 0e4b623bb3..b7d4ac63a9 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.GMAudit; import org.l2jmobius.gameserver.util.Util; @@ -210,7 +211,7 @@ public class RequestDropItem implements IClientIncomingPacket if ((dropedItem != null) && (dropedItem.getId() == Inventory.ADENA_ID) && (dropedItem.getCount() >= 1000000)) { final String msg = "Character (" + player.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")"; - LOGGER.warning(msg); + PacketLogger.warning(msg); AdminData.getInstance().broadcastMessageToGMs(msg); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java index e3ab837779..e8bfc249c9 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ExNeedToChangeName; /** @@ -42,6 +43,6 @@ public class RequestExChangeName implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); + PacketLogger.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java index 6e4861568e..c2f02f89ad 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chdd d: Arena d: Team @@ -74,7 +75,7 @@ public class RequestExCubeGameChangeTeam implements IClientIncomingPacket } default: { - LOGGER.warning("Wrong Cube Game Team ID: " + _team); + PacketLogger.warning("Wrong Cube Game Team ID: " + _team); break; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java index 009b836b6d..d72fdfc413 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chddd d: Arena d: Answer @@ -64,7 +65,7 @@ public class RequestExCubeGameReadyAnswer implements IClientIncomingPacket } default: { - LOGGER.warning("Unknown Cube Game Answer ID: " + _answer); + PacketLogger.warning("Unknown Cube Game Answer ID: " + _answer); break; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java index ff12adb20d..3347f01941 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) just a trigger @@ -34,6 +35,6 @@ public class RequestExFishRanking implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestExFishRanking"); + PacketLogger.info("C5: RequestExFishRanking"); } } \ No newline at end of file diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 57e8e7d2e5..8851aef463 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; import org.l2jmobius.gameserver.util.Broadcast; @@ -86,7 +87,7 @@ public class RequestExMagicSkillUseGround implements IClientIncomingPacket else { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("No skill found with id " + _skillId + " and level " + level + " !!"); + PacketLogger.warning("No skill found with id " + _skillId + " and level " + level + " !!"); } } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 77093c5f2d..2d9f0456f4 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; @@ -73,7 +74,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket client.sendPacket(new ExPutEnchantTargetItemResult(0)); if (scrollTemplate == null) { - LOGGER.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); + PacketLogger.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); } return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java index 05e09e6dfc..0a4522bf64 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressMapInfo; @@ -43,7 +44,7 @@ public class RequestFortressMapInfo implements IClientIncomingPacket final Fort fort = FortManager.getInstance().getFortById(_fortressId); if (fort == null) { - LOGGER.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); + PacketLogger.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); if (client.getPlayer() == null) { 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 f65a63d325..dc903790d0 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 @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) d @@ -44,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - LOGGER.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning("Player " + 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/RequestGetItemFromPet.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index a9fd8d923a..48e75fc61b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.util.Util; @@ -84,7 +85,7 @@ public class RequestGetItemFromPet implements IClientIncomingPacket } else { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 79e1193ac0..22f2f24422 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.util.Util; @@ -124,7 +125,7 @@ public class RequestGiveItemToPet implements IClientIncomingPacket } else { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } 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 5d9ff7b557..822c7231bc 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 @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaEquipList; @@ -60,7 +61,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.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 fa21b68043..a7c019d65d 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; @@ -52,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - LOGGER.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); } client.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 b943775334..ff96a400c9 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; @@ -50,10 +51,11 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.sendPacket(ActionFailed.STATIC_PACKET); return; } + player.sendPacket(new HennaItemRemoveInfo(henna, player)); } } 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 f511a8e30d..732efa0d71 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -76,7 +77,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); client.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 53f04488a6..ada67e190c 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -49,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - LOGGER.warning("Player " + actor.getName() + " sent empty html link!"); + PacketLogger.warning("Player " + actor.getName() + " sent empty html link!"); return; } if (_link.contains("..")) { - LOGGER.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); return; } final int htmlObjectId = actor.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - LOGGER.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java index 89adeae67b..2e1c1c83f6 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author UnAfraid @@ -51,7 +52,7 @@ public class RequestMagicSkillList implements IClientIncomingPacket if (player.getObjectId() != _objectId) { - LOGGER.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); + PacketLogger.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 9432941937..a228079092 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -64,7 +64,7 @@ public class RequestMagicSkillUse implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); // if (_magicId > 0) // { - // LOGGER.warning("Skill Id " + _magicId + " not found in player: " + player); + // PacketLogger.warning("Skill Id " + _magicId + " not found in player: " + player); // } return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 5fbcac0eca..9149ce1284 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListDelete; @@ -71,7 +72,7 @@ public class RequestOustPledgeMember implements IClientIncomingPacket final ClanMember member = clan.getClanMember(_target); if (member == null) { - LOGGER.warning("Target (" + _target + ") is not member of the clan"); + PacketLogger.warning("Target (" + _target + ") is not member of the clan"); return; } if (member.isOnline() && member.getPlayer().isInCombat()) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java index 9702554c3b..209835b319 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) S @@ -37,6 +38,6 @@ public class RequestPCCafeCouponUse implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestPCCafeCouponUse: S: " + _str); + PacketLogger.info("C5: RequestPCCafeCouponUse: S: " + _str); } } 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 4d3adf25dc..e8de8fee2a 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 @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -113,7 +114,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item item = player.checkItemManipulation(i.getId(), i.getCount(), "freight"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); warehouse.deleteMe(); return; } @@ -162,7 +163,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); warehouse.deleteMe(); return; } @@ -170,7 +171,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem("Trade", i.getId(), i.getCount(), warehouse, player, null); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 2c715b4efb..0d858fb452 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -137,7 +138,7 @@ public class RequestPetUseItem implements IClientIncomingPacket else { player.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM); - LOGGER.warning("No item handler registered for itemId: " + item.getId()); + PacketLogger.warning("No item handler registered for itemId: " + item.getId()); } } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index 8ece2b3ec7..fec0dc36a0 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -25,6 +25,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Plim @@ -74,7 +75,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket } catch (SQLException e) { - LOGGER.severe("Error while saving petition feedback"); + PacketLogger.warning("Error while saving petition feedback."); } } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java index d212481717..3459b04c80 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java @@ -44,8 +44,8 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket @Override public void run(GameClient client) { - // LOGGER.info("C5: RequestPledgeMemberInfo d:"+_unk1); - // LOGGER.info("C5: RequestPledgeMemberInfo S:"+_player); + // PacketLogger.info("C5: RequestPledgeMemberInfo d:"+_unk1); + // PacketLogger.info("C5: RequestPledgeMemberInfo S:"+_player); final Player player = client.getPlayer(); if (player == null) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index e56c105cf4..44bbd9d34c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.HashMap; import java.util.Map; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -38,6 +37,7 @@ import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; @@ -74,7 +74,7 @@ public class RequestPreviewItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } @@ -152,7 +152,7 @@ public class RequestPreviewItem implements IClientIncomingPacket final Merchant merchant = (target instanceof Merchant) ? (Merchant) target : null; if (merchant == null) { - LOGGER.warning("Null merchant!"); + PacketLogger.warning(getClass().getSimpleName() + ": Null merchant!"); 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 251757c0ba..94958bc4fe 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.util.Util; @@ -145,7 +146,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if (result > 1) { - LOGGER.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); } return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java index 9998465898..8ab3d4962f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; public class RequestPrivateStoreSell implements IClientIncomingPacket @@ -134,7 +135,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket if (!storeList.privateStoreSell(player, _items)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index a4010ca2cb..1632df189f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -193,7 +194,7 @@ public class RequestRefundItem implements IClientIncomingPacket final Item item = player.getRefund().transferItem("Refund", objectIds[i], Long.MAX_VALUE, player.getInventory(), player, player.getLastFolkNPC()); if (item == null) { - LOGGER.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index ee78579ea4..8a2f42272a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket { @@ -54,7 +55,7 @@ public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket } else { - LOGGER.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); + PacketLogger.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); } player.onTransactionRequest(requestor); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index afc4e65df4..08ad2c7763 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @version $Revision: 1.7.2.3.2.6 $ $Date: 2005/03/27 15:29:30 $ @@ -139,7 +140,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if ((player.getClan() == null) || (player.getClan().getHideoutId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.CLANHALL); @@ -167,7 +168,7 @@ public class RequestRestartPoint implements IClientIncomingPacket } else { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); return; } } @@ -199,7 +200,7 @@ public class RequestRestartPoint implements IClientIncomingPacket final Clan clan = player.getClan(); if ((clan == null) || (clan.getFortId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.FORTRESS); @@ -231,7 +232,7 @@ public class RequestRestartPoint implements IClientIncomingPacket if (((siegeClan == null) || siegeClan.getFlag().isEmpty())) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.SIEGEFLAG); @@ -241,7 +242,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if (!player.isGM() && !player.getInventory().haveItemForSelfResurrection()) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); return; } if (player.isGM() || player.destroyItemByItemId("Feather", 10649, 1, player, false) || player.destroyItemByItemId("Feather", 13300, 1, player, false) || player.destroyItemByItemId("Feather", 13128, 1, player, false)) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index cd8e900014..3582b308eb 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExNoticePostSent; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -316,14 +317,14 @@ public class RequestSendPost implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getObjectId(), i.getCount(), "attach"); if ((oldItem == null) || !oldItem.isTradeable() || oldItem.isEquipped()) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); return false; } final Item newItem = player.getInventory().transferItem("SendMail", i.getObjectId(), i.getCount(), attachments, player, msg.getReceiverName() + "[" + msg.getReceiverId() + "]"); if (newItem == null) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java index 2a33016c9a..b5d130046c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -54,16 +55,16 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket final Castle castle = CastleManager.getInstance().getCastleById(_castleId); if ((player == null) || (castle == null)) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); return; } if ((castle.getOwnerId() > 0) && (castle.getOwnerId() != player.getClanId())) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); } else if (!player.isClanLeader()) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); } else if (!castle.isTimeRegistrationOver()) { @@ -79,12 +80,12 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); } } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); } } 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 899777642d..4e71d6d57e 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 @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; @@ -112,7 +113,7 @@ public class Say2 implements IClientIncomingPacket ChatType chatType = ChatType.findByClientId(_type); if (chatType == null) { - LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); + PacketLogger.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -120,7 +121,7 @@ public class Say2 implements IClientIncomingPacket if (_text.isEmpty()) { - LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); + PacketLogger.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -214,7 +215,7 @@ public class Say2 implements IClientIncomingPacket } else { - LOGGER.info("No handler registered for ChatType: " + _type + " Player: " + client); + PacketLogger.info("No handler registered for ChatType: " + _type + " Player: " + client); } } @@ -260,7 +261,7 @@ public class Say2 implements IClientIncomingPacket final Item item = owner.getInventory().getItemByObjectId(id); if (item == null) { - LOGGER.info(client + " trying publish item which doesnt own! ID:" + id); + PacketLogger.info(client + " trying publish item which doesnt own! ID:" + id); return false; } item.publish(); @@ -268,7 +269,7 @@ public class Say2 implements IClientIncomingPacket pos1 = _text.indexOf(8, pos) + 1; if (pos1 == 0) // missing ending tag { - LOGGER.info(client + " sent invalid publish item msg! ID:" + id); + PacketLogger.info(client + " sent invalid publish item msg! ID:" + id); return false; } } 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 f89be1cfcb..84b879e0f7 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 @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -127,7 +128,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item item = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); return; } @@ -174,7 +175,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } @@ -186,7 +187,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem(warehouse.getName(), itemHolder.getId(), itemHolder.getCount(), warehouse, player, manager); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 1b5eb14605..984b90ec48 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; @@ -156,14 +157,14 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket final Item oldItem = warehouse.getItemByObjectId(i.getId()); if ((oldItem == null) || (oldItem.getCount() < i.getCount())) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } final Item newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, player.getLastFolkNPC()); if (newItem == null) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); return; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 65d55dac0c..d7f0dc28ec 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExShowVariationMakeWindow; @@ -282,7 +283,7 @@ public class UseItem implements IClientIncomingPacket { if ((etcItem != null) && (etcItem.getHandlerName() != null)) { - LOGGER.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); + PacketLogger.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); } } else if (handler.useItem(player, item, _ctrlPressed)) 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 36f9206cb0..ece66b1cd9 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -56,12 +57,12 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final SkillHolder holder = new SkillHolder(packet.readD(), packet.readD()); if (holder.getSkillLevel() < 1) { - LOGGER.warning("Player " + client + " is trying to learn skill " + holder + " by sending packet with level 0!"); + PacketLogger.warning("Player " + client + " is trying to learn skill " + holder + " by sending packet with level 0!"); return false; } if (_skills.putIfAbsent(holder.getSkillId(), holder) != null) { - LOGGER.warning("Player " + client + " is trying to send two times one skill " + holder + " to learn!"); + PacketLogger.warning("Player " + client + " is trying to send two times one skill " + holder + " to learn!"); return false; } } @@ -85,7 +86,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket if ((player.getAbilityPoints() == 0) || (player.getAbilityPoints() == player.getAbilityPointsUsed())) { - LOGGER.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); return; } @@ -114,7 +115,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final SkillLearn learn = SkillTreeData.getInstance().getAbilitySkill(holder.getSkillId(), holder.getSkillLevel()); if (learn == null) { - LOGGER.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); + PacketLogger.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); client.sendPacket(ActionFailed.STATIC_PACKET); break; } @@ -122,7 +123,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final Skill skill = holder.getSkill(); if (skill == null) { - LOGGER.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); + PacketLogger.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); client.sendPacket(ActionFailed.STATIC_PACKET); break; } @@ -155,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]) { - LOGGER.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!"); + PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -165,7 +166,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket { if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel()) { - LOGGER.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); + PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -174,7 +175,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 3 Learning a skill without having enough points if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points) { - LOGGER.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java index d9a7fcb4cb..d25abdb61e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -98,13 +99,13 @@ public class RequestAlchemyConversion implements IClientIncomingPacket if (data == null) { player.sendPacket(new ExAlchemyConversion(0, 0)); - LOGGER.warning("Missing AlchemyData for skillId: " + _skillId + ", skillLevel: " + _skillLevel); + PacketLogger.warning("Missing AlchemyData for skillId: " + _skillId + ", skillLevel: " + _skillLevel); return; } // if (!_ingredients.equals(data.getIngredients())) // { - // LOGGER.warning("Client ingredients are not same as server ingredients for alchemy conversion player: "+ +"", player); + // PacketLogger.warning("Client ingredients are not same as server ingredients for alchemy conversion player: "+ +"", player); // return; // } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index 68da085e66..a36649b520 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -74,7 +75,7 @@ public class RequestAlchemyTryMixCube implements IClientIncomingPacket else // Player used packet injection tool. { final Player player = client.getPlayer(); - LOGGER.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName()); + PacketLogger.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName()); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return false; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java index 71532ab900..8173c9700e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.PlaySound; import org.l2jmobius.gameserver.network.serverpackets.classchange.ExClassChangeSetAlarm; @@ -89,7 +90,7 @@ public class ExRequestClassChange implements IClientIncomingPacket if (!canChange // && (_classId != 170) && (player.getClassId().getId() != 133)) // Female Soul Hound fix. { - LOGGER.warning(player + " tried to change class from " + player.getClassId() + " to " + ClassId.getClassId(_classId) + "!"); + PacketLogger.warning(player + " tried to change class from " + player.getClassId() + " to " + ClassId.getClassId(_classId) + "!"); 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 20d84a2bd6..6b2f96e87d 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; @@ -60,37 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - LOGGER.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 30% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 100% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - LOGGER.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - - LOGGER.warning("Player " + player + ": Auction House (15-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); return; - } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - LOGGER.warning("Player " + player + ": Auction House (30-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + 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/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index e09225bec1..9d5edbda7a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -94,7 +95,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning(player + ": tried to crystallize " + item.getItem()); + PacketLogger.warning(player + ": tried to crystallize " + item.getItem()); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index 6a17e5856a..1465b00631 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets.ensoul; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnsoulData; import org.l2jmobius.gameserver.enums.PrivateStoreType; @@ -28,6 +26,7 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -39,7 +38,6 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; */ public class RequestItemEnsoul implements IClientIncomingPacket { - private static final Logger LOGGER = Logger.getLogger(RequestItemEnsoul.class.getName()); private int _itemObjectId; private EnsoulItemOption[] _options; @@ -119,37 +117,37 @@ public class RequestItemEnsoul implements IClientIncomingPacket final Item item = player.getInventory().getItemByObjectId(_itemObjectId); if (item == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item without having it!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item without having it!"); return; } if (!item.isEquipable()) { - LOGGER.warning("Player: " + player + " attempting to ensoul non equippable item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul non equippable item: " + item + "!"); return; } if (!item.isWeapon()) { - LOGGER.warning("Player: " + player + " attempting to ensoul item that's not a weapon: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item that's not a weapon: " + item + "!"); return; } if (item.isCommonItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul common item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul common item: " + item + "!"); return; } if (item.isShadowItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul shadow item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul shadow item: " + item + "!"); return; } if (item.isHeroItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul hero item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul hero item: " + item + "!"); return; } if ((_options == null) || (_options.length == 0)) { - LOGGER.warning("Player: " + player + " attempting to ensoul item without any special ability declared!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item without any special ability declared!"); return; } @@ -173,14 +171,14 @@ public class RequestItemEnsoul implements IClientIncomingPacket if (!stone.getOptions().contains(itemOption.getSoulCrystalOption())) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that stone doesn't contains!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that stone doesn't contains!"); continue; } final EnsoulOption option = EnsoulData.getInstance().getOption(itemOption.getSoulCrystalOption()); if (option == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that doesn't exists!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that doesn't exists!"); continue; } @@ -205,13 +203,13 @@ public class RequestItemEnsoul implements IClientIncomingPacket } else { - LOGGER.warning("Player: " + player + " attempting to ensoul item option with unhandled type: " + itemOption.getType() + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option with unhandled type: " + itemOption.getType() + "!"); continue; } if (fee == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that doesn't exists! (unknown fee)"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that doesn't exists! (unknown fee)"); continue; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java index b12c280c6d..635799d26b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java @@ -18,12 +18,12 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -102,7 +102,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e); + PacketLogger.warning("Could not add friend objectid: " + e.getMessage()); } } else diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java index 2dad174d89..73cd9a6a4b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -26,6 +25,7 @@ import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -99,7 +99,7 @@ public class RequestFriendDel implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not del friend objectid: ", e); + PacketLogger.warning("Could not del friend objectid: " + e.getMessage()); } } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java index 320b0f4209..b7e7c85447 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.model.homunculus.Homunculus; import org.l2jmobius.gameserver.model.homunculus.HomunculusTemplate; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.homunculus.ExHomunculusSummonResult; import org.l2jmobius.gameserver.network.serverpackets.homunculus.ExShowHomunculusBirthInfo; @@ -150,7 +151,7 @@ public class RequestExHomunculusSummon implements IClientIncomingPacket final HomunculusTemplate template = HomunculusData.getInstance().getTemplate(homunculusId); if (template == null) { - LOGGER.warning("Counld not find Homunculus template " + homunculusId + "."); + PacketLogger.warning("Counld not find Homunculus template " + homunculusId + "."); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index 7afab50b4f..5f884b565a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.mentoring; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMenteeAdd; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -93,7 +93,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, e.getMessage(), e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index 41700d0f61..39121a166d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; @@ -56,7 +57,7 @@ public class RequestExPledgeMissionReward implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { - LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); + PacketLogger.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java index ee8910d06e..a53878b794 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductList; @@ -60,7 +61,7 @@ public class RequestBRProductList implements IClientIncomingPacket } default: { - LOGGER.warning(player + " send unhandled product list type: " + _type); + PacketLogger.warning(player + " send unhandled product list type: " + _type); break; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java index 10c89bed0e..f29aabd0cb 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java @@ -51,7 +51,7 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket } else { - // LOGGER.warning("Could not find spawn info for boss " + bossId + "."); + // PacketLogger.warning("Could not find spawn info for boss " + bossId + "."); } } else diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java index e83bf335a7..a828073bb9 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.SayuneRequest; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.type.SayuneZone; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; @@ -72,7 +73,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (zone.getMapId() == -1) { player.sendMessage("That zone is not supported yet!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); return; } @@ -80,7 +81,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (map == null) { player.sendMessage("This zone is not handled yet!!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java index f1ede4ef0a..41648f184f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Shuttle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -60,7 +61,7 @@ public class RequestShuttleGetOn implements IClientIncomingPacket player.getInVehiclePosition().setXYZ(_x, _y, _z); break; } - LOGGER.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); + PacketLogger.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); } } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleport.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleport.java index b783c9696c..2e5317f897 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleport.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleport.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.holders.TeleportListHolder; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; @@ -55,7 +56,7 @@ public class ExRequestTeleport implements IClientIncomingPacket final TeleportListHolder teleport = TeleportListData.getInstance().getTeleport(_teleportId); if (teleport == null) { - LOGGER.warning("No registered teleport location for id: " + _teleportId); + PacketLogger.warning("No registered teleport location for id: " + _teleportId); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoritesAddDel.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoritesAddDel.java index a5b01e87b5..50f4b4d87d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoritesAddDel.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoritesAddDel.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.data.xml.TeleportListData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -53,7 +54,7 @@ public class ExRequestTeleportFavoritesAddDel implements IClientIncomingPacket if (TeleportListData.getInstance().getTeleport(_teleportId) == null) { - LOGGER.warning("No registered teleport location for id: " + _teleportId); + PacketLogger.warning("No registered teleport location for id: " + _teleportId); return; } @@ -62,7 +63,7 @@ public class ExRequestTeleportFavoritesAddDel implements IClientIncomingPacket { if (TeleportListData.getInstance().getTeleport(_teleportId) == null) { - LOGGER.warning("No registered teleport location for id: " + _teleportId); + PacketLogger.warning("No registered teleport location for id: " + _teleportId); } else { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 33eeff5060..1b8ddb2042 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -16,11 +16,10 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Level; - import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.util.Util; /** @@ -75,7 +74,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { if (html.length() > 17200) { - LOGGER.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable()); + PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } @@ -94,7 +93,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket if (content == null) { setHtml("My Text is missing:
" + path + ""); - LOGGER.warning("missing html page " + path); + PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index e6b4b8b604..57ed88ac29 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; /** @@ -46,7 +47,7 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index d94dbf4403..75f6596194 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Migi, DS @@ -44,7 +45,7 @@ public class ExReplySentPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index b0f3738683..15d011befc 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author KenM @@ -54,7 +55,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); + PacketLogger.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); packet.writeS(""); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index d588f1c7cf..b5c8628b50 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IOutgoingPacket; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; @@ -28,8 +26,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; */ public interface IClientOutgoingPacket extends IOutgoingPacket { - Logger LOGGER = Logger.getLogger(IClientOutgoingPacket.class.getName()); - int[] PAPERDOLL_ORDER = new int[] { Inventory.PAPERDOLL_UNDER, diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 29a4f31530..79d478aff9 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan.SubPledge; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author -Wooden- @@ -56,7 +57,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket } else if (_clan.getClanMember(LeaderId) == null) { - LOGGER.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); + PacketLogger.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); return ""; } else diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index a95e7ab97c..d9c2621c84 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.RecipeData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.RecipeHolder; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class RecipeItemMakeInfo implements IClientOutgoingPacket { @@ -77,7 +78,8 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeQ(_offeringMaximumAdena); // Adena worth of items for maximum offering. return true; } - LOGGER.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); + + PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 432ff8ad7f..0a3fe46cb7 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Shows the Siege Info
@@ -78,7 +79,7 @@ public class SiegeInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Null owner for castle: " + _castle.getName()); + PacketLogger.warning("Null owner for castle: " + _castle.getName()); } } else diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 44f290e92f..746b2da3f7 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; @@ -157,7 +158,7 @@ public class SystemMessage implements IClientOutgoingPacket // Mobius: With additional on-screen damage param (popup), length is increased. if (param.getType() != TYPE_POPUP_ID) { - LOGGER.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); + PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } @@ -414,7 +415,7 @@ public class SystemMessage implements IClientOutgoingPacket { if (param == null) { - LOGGER.warning("Found null parameter for SystemMessageId " + _smId); + PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 37150ec357..7af1cd273c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -24,6 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class WareHouseWithdrawalList extends AbstractItemPacket { @@ -56,7 +57,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket _invSize = player.getInventory().getSize(); if (_player.getActiveWarehouse() == null) { - LOGGER.warning("error while sending withdraw request to: " + _player.getName()); + PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java index a63178770a..d1896f32a7 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.instancemanager.RankManager; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; /** @@ -134,7 +135,7 @@ public class ExOlympiadHeroAndLegendInfo implements IClientOutgoingPacket } catch (SQLException e) { - LOGGER.warning("Hero and Legend Info: Couldnt load data: " + e.getMessage()); + PacketLogger.warning("Hero and Legend Info: Couldnt load data: " + e.getMessage()); } } return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java index 710d957175..b7395dee4e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; /** @@ -96,7 +97,7 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket } catch (SQLException e) { - LOGGER.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); + PacketLogger.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); } int previousPlace = 0; @@ -125,7 +126,7 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket } catch (SQLException e) { - LOGGER.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); + PacketLogger.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); } int heroCount = 0; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/PacketLogger.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/PacketLogger.java new file mode 100644 index 0000000000..5b5a083a99 --- /dev/null +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/PacketLogger.java @@ -0,0 +1,42 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.network; + +import java.util.logging.Logger; + +/** + * @author Mobius + */ +public class PacketLogger +{ + private static final Logger LOGGER = Logger.getLogger(PacketLogger.class.getName()); + + public static synchronized void warning(String message) + { + LOGGER.warning(message); + } + + public static synchronized void info(String message) + { + LOGGER.info(message); + } + + public static synchronized void finer(String message) + { + LOGGER.finer(message); + } +} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 7c343f78be..ef3f4acc18 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -161,7 +162,7 @@ public class Action implements IClientIncomingPacket default: { // Invalid action detected (probably client cheating), log this - LOGGER.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); + PacketLogger.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); client.sendPacket(ActionFailed.STATIC_PACKET); break; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index 31d29ef3dd..8e8ae2c190 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; import org.l2jmobius.gameserver.network.serverpackets.TradeOwnAdd; @@ -58,7 +59,7 @@ public class AddTradeItem implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - LOGGER.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); + PacketLogger.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); return; } @@ -68,7 +69,7 @@ public class AddTradeItem implements IClientIncomingPacket // Trade partner not found, cancel trade if (partner != null) { - LOGGER.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); + PacketLogger.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); } player.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE); player.cancelActiveTrade(); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 20134dd2bb..a3236b0d83 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -62,7 +62,7 @@ public class CannotMoveAnymore implements IClientIncomingPacket // player.stopMove(); // // if (Config.DEBUG) - // LOGGER.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ + // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); // StopMove smwl = new StopMove(player); // client.getPlayer().sendPacket(smwl); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 1872b6fa54..2a1beff259 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -46,6 +46,7 @@ import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; import org.l2jmobius.gameserver.network.serverpackets.CharCreateOk; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -127,21 +128,21 @@ public class CharacterCreate implements IClientIncomingPacket if ((_face > 2) || (_face < 0)) { - LOGGER.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairStyle < 0) || ((_sex == 0) && (_hairStyle > 4)) || ((_sex != 0) && (_hairStyle > 6))) { - LOGGER.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairColor > 3) || (_hairColor < 0)) { - LOGGER.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } @@ -345,7 +346,7 @@ public class CharacterCreate implements IClientIncomingPacket final Item item = newChar.getInventory().addItem("Init", ie.getId(), ie.getCount(), newChar, null); if (item == null) { - LOGGER.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); + PacketLogger.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); continue; } @@ -362,7 +363,7 @@ public class CharacterCreate implements IClientIncomingPacket final Item item = newChar.getInventory().addItem("Balthus Rewards", reward.getId(), reward.getCount(), newChar, null); if (item == null) { - LOGGER.warning("Could not create item during char creation: itemId " + reward.getId() + ", amount " + reward.getCount() + "."); + PacketLogger.warning("Could not create item during char creation: itemId " + reward.getId() + ", amount " + reward.getCount() + "."); continue; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java index 86c425fa45..63c3261946 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Level; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.CharacterDeleteFailType; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -25,6 +23,7 @@ import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDelete; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteFail; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteSuccess; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -74,7 +73,7 @@ public class CharacterDelete implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Error:", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1, 0); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java index 5f74c38273..cfe9b20f3d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java @@ -47,7 +47,7 @@ public class EndScenePlayer implements IClientIncomingPacket final MovieHolder holder = player.getMovieHolder(); if ((holder == null) || (holder.getMovie().getClientId() != _movieId)) { - // LOGGER.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); + // PacketLogger.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 2f698b0d55..82c24b3907 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -71,6 +71,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.Die; @@ -160,7 +161,7 @@ public class EnterWorld implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.warning("EnterWorld failed! player returned 'null'."); + PacketLogger.warning("EnterWorld failed! player returned 'null'."); Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java index 8bde20da0a..14e8153478 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java @@ -25,9 +25,13 @@ import org.l2jmobius.gameserver.network.GameClient; */ public class ExGetOnAirShip implements IClientIncomingPacket { + @SuppressWarnings("unused") private int _x; + @SuppressWarnings("unused") private int _y; + @SuppressWarnings("unused") private int _z; + @SuppressWarnings("unused") private int _shipId; @Override @@ -43,9 +47,9 @@ public class ExGetOnAirShip implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("[T1:ExGetOnAirShip] x: " + _x); - LOGGER.info("[T1:ExGetOnAirShip] y: " + _y); - LOGGER.info("[T1:ExGetOnAirShip] z: " + _z); - LOGGER.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); + // PacketLogger.info("[T1:ExGetOnAirShip] x: " + _x); + // PacketLogger.info("[T1:ExGetOnAirShip] y: " + _y); + // PacketLogger.info("[T1:ExGetOnAirShip] z: " + _z); + // PacketLogger.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ExOpenHtml.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ExOpenHtml.java index 776e0703d6..fb19d3a828 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ExOpenHtml.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ExOpenHtml.java @@ -21,6 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ExPremiumManagerShowHtml; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -77,7 +78,7 @@ public class ExOpenHtml implements IClientIncomingPacket } default: { - LOGGER.warning("Unknown ExOpenHtml type (" + _type + ")"); + PacketLogger.warning("Unknown ExOpenHtml type (" + _type + ")"); break; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java index fcdd8335f4..4e91188f5c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java @@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Arrays; -import java.util.logging.Level; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: c dddd @@ -79,7 +79,7 @@ public class GameGuardReply implements IClientIncomingPacket } catch (NoSuchAlgorithmException e) { - LOGGER.log(Level.WARNING, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java index eddff9f891..62e69acd86 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.gameserver.network.GameClient; @@ -27,5 +25,4 @@ import org.l2jmobius.gameserver.network.GameClient; */ public interface IClientIncomingPacket extends IIncomingPacket { - Logger LOGGER = Logger.getLogger(IClientIncomingPacket.class.getName()); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 8ff8d6ef9a..3b9960aef4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -153,7 +154,7 @@ public class MultiSellChoose implements IClientIncomingPacket if (((_soulCrystalOptions != null) && CommonUtil.contains(_soulCrystalOptions, null)) || ((_soulCrystalSpecialOptions != null) && CommonUtil.contains(_soulCrystalSpecialOptions, null))) { - LOGGER.severe("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -161,14 +162,14 @@ public class MultiSellChoose implements IClientIncomingPacket final MultisellEntryHolder entry = list.getEntries().get(_entryId - 1); // Entry Id begins from 1. We currently use entry IDs as index pointer. if (entry == null) { - LOGGER.severe("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } if (!entry.isStackable() && (_amount > 1)) { - LOGGER.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -196,7 +197,7 @@ public class MultiSellChoose implements IClientIncomingPacket )) //@formatter:on { - LOGGER.severe("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -372,7 +373,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); return; } } @@ -487,7 +488,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); return; } } @@ -691,7 +692,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); + PacketLogger.warning("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); return false; } } 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 f778c388f5..0c9ba62406 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 @@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillDone; import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; @@ -104,7 +105,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if ((_level < 1) || (_level > 1000) || (_id < 1) || (_id > 64000)) { Util.handleIllegalPlayerAction(player, "Wrong Packet Data in Aquired Skill", Config.DEFAULT_PUNISH); - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); return; } @@ -118,7 +119,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - LOGGER.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -450,7 +451,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket } default: { - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); break; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 0a570fd3ef..4bb789645a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillInfo; import org.l2jmobius.gameserver.network.serverpackets.ExAcquireSkillInfo; @@ -55,7 +56,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket { if ((_id <= 0) || (_level <= 0)) { - LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); return; } @@ -74,7 +75,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level); if (skill == null) { - LOGGER.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); + PacketLogger.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); return; } 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 5e0a2af0c9..8078d0c10e 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.Arrays; -import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.ActionData; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; @@ -41,8 +41,6 @@ import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList; */ public class RequestActionUse implements IClientIncomingPacket { - private static final Logger LOGGER = Logger.getLogger(RequestActionUse.class.getName()); - private int _actionId; private boolean _ctrlPressed; private boolean _shiftPressed; @@ -93,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } @@ -107,7 +105,7 @@ public class RequestActionUse implements IClientIncomingPacket actionHandler.useAction(player, actionHolder, _ctrlPressed, _shiftPressed); return; } - LOGGER.warning("Couldnt find handler with name: " + actionHolder.getHandler()); + PacketLogger.warning("Couldn't find handler with name: " + actionHolder.getHandler()); return; } @@ -143,7 +141,7 @@ public class RequestActionUse implements IClientIncomingPacket } default: { - LOGGER.warning(player.getName() + ": unhandled action type " + _actionId); + PacketLogger.warning(player.getName() + ": unhandled action type " + _actionId); break; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoUse.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoUse.java index 0729d6656c..f33a0c4567 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoUse.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoUse.java @@ -27,30 +27,30 @@ public class RequestAutoUse implements IClientIncomingPacket @Override public boolean read(GameClient client, PacketReader packet) { - final int unk1 = packet.readC(); // C - true. This is summary amount of next data received. - LOGGER.info("received packet RequestAutoUse with unk1:" + unk1); - final int unk2 = packet.readC(); - LOGGER.info("and unk2: " + unk2); - final int unk3 = packet.readC(); // Can target mobs, that attacked by other players? - LOGGER.info("and unk3: " + unk3); - final int unk4 = packet.readC(); // Auto pickup? - LOGGER.info("and unk4: " + unk4); - final int unk5 = packet.readC(); - LOGGER.info("and unk5: " + unk5); - final int unk6 = packet.readC(); - LOGGER.info("and unk6: " + unk6); - final int unk7 = packet.readC(); // short range :1; long: 0 - LOGGER.info("and unk7: " + unk7); - final int unk8 = packet.readC(); // received 51 when logged in game... - LOGGER.info("and unk8: " + unk8); - final int unk9 = packet.readC(); - LOGGER.info("and unk9: " + unk9); - final int unk10 = packet.readC(); - LOGGER.info("and unk10: " + unk10); - final int unk11 = packet.readC(); - LOGGER.info("and unk11: " + unk11); - final int unk12 = packet.readC(); // enable/ disable? - LOGGER.info("and unk12: " + unk12); + // final int unk1 = packet.readC(); // C - true. This is summary amount of next data received. + // PacketLogger.info("received packet RequestAutoUse with unk1:" + unk1); + // final int unk2 = packet.readC(); + // PacketLogger.info("and unk2: " + unk2); + // final int unk3 = packet.readC(); // Can target mobs, that attacked by other players? + // PacketLogger.info("and unk3: " + unk3); + // final int unk4 = packet.readC(); // Auto pickup? + // PacketLogger.info("and unk4: " + unk4); + // final int unk5 = packet.readC(); + // PacketLogger.info("and unk5: " + unk5); + // final int unk6 = packet.readC(); + // PacketLogger.info("and unk6: " + unk6); + // final int unk7 = packet.readC(); // short range :1; long: 0 + // PacketLogger.info("and unk7: " + unk7); + // final int unk8 = packet.readC(); // received 51 when logged in game... + // PacketLogger.info("and unk8: " + unk8); + // final int unk9 = packet.readC(); + // PacketLogger.info("and unk9: " + unk9); + // final int unk10 = packet.readC(); + // PacketLogger.info("and unk10: " + unk10); + // final int unk11 = packet.readC(); + // PacketLogger.info("and unk11: " + unk11); + // final int unk12 = packet.readC(); // enable/ disable? + // PacketLogger.info("and unk12: " + unk12); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java index 1fa1214bea..76649875f1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.data.xml.FakePlayerData; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -130,7 +131,7 @@ public class RequestBlock implements IClientIncomingPacket } default: { - LOGGER.info("Unknown 0xA9 block type: " + _type); + PacketLogger.info("Unknown 0xA9 block type: " + _type); } } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index eb7e62ebf2..ce3d851f06 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -161,7 +162,7 @@ public class RequestBuyItem implements IClientIncomingPacket long price = product.getPrice(); if (price < 0) { - LOGGER.warning("ERROR, no price found .. wrong buylist ??"); + PacketLogger.warning("ERROR, no price found .. wrong buylist ??"); client.sendPacket(ActionFailed.STATIC_PACKET); 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 47214311ac..4d8e55bc8e 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.StringTokenizer; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -43,6 +42,7 @@ import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -90,7 +90,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -194,7 +194,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (NumberFormatException nfe) { - LOGGER.log(Level.WARNING, "NFE for command [" + _command + "]", nfe); + PacketLogger.warning("NFE for command [" + _command + "] " + nfe.getMessage()); } } else if (_command.startsWith("_match")) @@ -295,13 +295,13 @@ public class RequestBypassToServer implements IClientIncomingPacket } else { - LOGGER.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); + PacketLogger.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); } } } catch (Exception e) { - LOGGER.log(Level.WARNING, "Exception processing bypass from player " + player.getName() + ": " + _command, e); + PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _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/RequestCrystallizeItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index c140d42b69..e0443b72b7 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -59,7 +60,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.finer("RequestCrystalizeItem: activeChar was null"); + // PacketLogger.finer("RequestCrystalizeItem: activeChar was null."); return; } @@ -87,7 +88,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - LOGGER.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 4f351a636b..cb90d581c8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; @@ -33,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -169,7 +169,7 @@ public class RequestDestroyItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not delete pet objectid: ", e); + PacketLogger.warning("Could not delete pet objectid: " + e.getMessage()); } } if (itemToRemove.isTimeLimitedItem()) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 0e4b623bb3..b7d4ac63a9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.GMAudit; import org.l2jmobius.gameserver.util.Util; @@ -210,7 +211,7 @@ public class RequestDropItem implements IClientIncomingPacket if ((dropedItem != null) && (dropedItem.getId() == Inventory.ADENA_ID) && (dropedItem.getCount() >= 1000000)) { final String msg = "Character (" + player.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")"; - LOGGER.warning(msg); + PacketLogger.warning(msg); AdminData.getInstance().broadcastMessageToGMs(msg); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java index e3ab837779..e8bfc249c9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ExNeedToChangeName; /** @@ -42,6 +43,6 @@ public class RequestExChangeName implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); + PacketLogger.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java index 6e4861568e..c2f02f89ad 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chdd d: Arena d: Team @@ -74,7 +75,7 @@ public class RequestExCubeGameChangeTeam implements IClientIncomingPacket } default: { - LOGGER.warning("Wrong Cube Game Team ID: " + _team); + PacketLogger.warning("Wrong Cube Game Team ID: " + _team); break; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java index 009b836b6d..d72fdfc413 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chddd d: Arena d: Answer @@ -64,7 +65,7 @@ public class RequestExCubeGameReadyAnswer implements IClientIncomingPacket } default: { - LOGGER.warning("Unknown Cube Game Answer ID: " + _answer); + PacketLogger.warning("Unknown Cube Game Answer ID: " + _answer); break; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java index ff12adb20d..3347f01941 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) just a trigger @@ -34,6 +35,6 @@ public class RequestExFishRanking implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestExFishRanking"); + PacketLogger.info("C5: RequestExFishRanking"); } } \ No newline at end of file diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 57e8e7d2e5..8851aef463 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; import org.l2jmobius.gameserver.util.Broadcast; @@ -86,7 +87,7 @@ public class RequestExMagicSkillUseGround implements IClientIncomingPacket else { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("No skill found with id " + _skillId + " and level " + level + " !!"); + PacketLogger.warning("No skill found with id " + _skillId + " and level " + level + " !!"); } } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 77093c5f2d..2d9f0456f4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; @@ -73,7 +74,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket client.sendPacket(new ExPutEnchantTargetItemResult(0)); if (scrollTemplate == null) { - LOGGER.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); + PacketLogger.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); } return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java index 05e09e6dfc..0a4522bf64 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressMapInfo; @@ -43,7 +44,7 @@ public class RequestFortressMapInfo implements IClientIncomingPacket final Fort fort = FortManager.getInstance().getFortById(_fortressId); if (fort == null) { - LOGGER.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); + PacketLogger.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); if (client.getPlayer() == null) { 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 f65a63d325..dc903790d0 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 @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) d @@ -44,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - LOGGER.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning("Player " + 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/RequestGetItemFromPet.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index a9fd8d923a..48e75fc61b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.util.Util; @@ -84,7 +85,7 @@ public class RequestGetItemFromPet implements IClientIncomingPacket } else { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 79e1193ac0..22f2f24422 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.util.Util; @@ -124,7 +125,7 @@ public class RequestGiveItemToPet implements IClientIncomingPacket } else { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } 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 5d9ff7b557..822c7231bc 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 @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaEquipList; @@ -60,7 +61,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.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 fa21b68043..a7c019d65d 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; @@ -52,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - LOGGER.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); } client.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 b943775334..ff96a400c9 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; @@ -50,10 +51,11 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.sendPacket(ActionFailed.STATIC_PACKET); return; } + player.sendPacket(new HennaItemRemoveInfo(henna, player)); } } 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 f511a8e30d..732efa0d71 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -76,7 +77,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); client.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 53f04488a6..ada67e190c 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -49,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - LOGGER.warning("Player " + actor.getName() + " sent empty html link!"); + PacketLogger.warning("Player " + actor.getName() + " sent empty html link!"); return; } if (_link.contains("..")) { - LOGGER.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); return; } final int htmlObjectId = actor.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - LOGGER.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java index 89adeae67b..2e1c1c83f6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author UnAfraid @@ -51,7 +52,7 @@ public class RequestMagicSkillList implements IClientIncomingPacket if (player.getObjectId() != _objectId) { - LOGGER.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); + PacketLogger.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 9432941937..a228079092 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -64,7 +64,7 @@ public class RequestMagicSkillUse implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); // if (_magicId > 0) // { - // LOGGER.warning("Skill Id " + _magicId + " not found in player: " + player); + // PacketLogger.warning("Skill Id " + _magicId + " not found in player: " + player); // } return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 5fbcac0eca..9149ce1284 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListDelete; @@ -71,7 +72,7 @@ public class RequestOustPledgeMember implements IClientIncomingPacket final ClanMember member = clan.getClanMember(_target); if (member == null) { - LOGGER.warning("Target (" + _target + ") is not member of the clan"); + PacketLogger.warning("Target (" + _target + ") is not member of the clan"); return; } if (member.isOnline() && member.getPlayer().isInCombat()) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java index 9702554c3b..209835b319 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) S @@ -37,6 +38,6 @@ public class RequestPCCafeCouponUse implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestPCCafeCouponUse: S: " + _str); + PacketLogger.info("C5: RequestPCCafeCouponUse: S: " + _str); } } 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 4d3adf25dc..e8de8fee2a 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 @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -113,7 +114,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item item = player.checkItemManipulation(i.getId(), i.getCount(), "freight"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); warehouse.deleteMe(); return; } @@ -162,7 +163,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); warehouse.deleteMe(); return; } @@ -170,7 +171,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem("Trade", i.getId(), i.getCount(), warehouse, player, null); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 2c715b4efb..0d858fb452 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -137,7 +138,7 @@ public class RequestPetUseItem implements IClientIncomingPacket else { player.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM); - LOGGER.warning("No item handler registered for itemId: " + item.getId()); + PacketLogger.warning("No item handler registered for itemId: " + item.getId()); } } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index 8ece2b3ec7..fec0dc36a0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -25,6 +25,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Plim @@ -74,7 +75,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket } catch (SQLException e) { - LOGGER.severe("Error while saving petition feedback"); + PacketLogger.warning("Error while saving petition feedback."); } } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java index d212481717..3459b04c80 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java @@ -44,8 +44,8 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket @Override public void run(GameClient client) { - // LOGGER.info("C5: RequestPledgeMemberInfo d:"+_unk1); - // LOGGER.info("C5: RequestPledgeMemberInfo S:"+_player); + // PacketLogger.info("C5: RequestPledgeMemberInfo d:"+_unk1); + // PacketLogger.info("C5: RequestPledgeMemberInfo S:"+_player); final Player player = client.getPlayer(); if (player == null) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index e56c105cf4..44bbd9d34c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.HashMap; import java.util.Map; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -38,6 +37,7 @@ import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; @@ -74,7 +74,7 @@ public class RequestPreviewItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } @@ -152,7 +152,7 @@ public class RequestPreviewItem implements IClientIncomingPacket final Merchant merchant = (target instanceof Merchant) ? (Merchant) target : null; if (merchant == null) { - LOGGER.warning("Null merchant!"); + PacketLogger.warning(getClass().getSimpleName() + ": Null merchant!"); 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 251757c0ba..94958bc4fe 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.util.Util; @@ -145,7 +146,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if (result > 1) { - LOGGER.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); } return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java index 9998465898..8ab3d4962f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; public class RequestPrivateStoreSell implements IClientIncomingPacket @@ -134,7 +135,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket if (!storeList.privateStoreSell(player, _items)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index a4010ca2cb..1632df189f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -193,7 +194,7 @@ public class RequestRefundItem implements IClientIncomingPacket final Item item = player.getRefund().transferItem("Refund", objectIds[i], Long.MAX_VALUE, player.getInventory(), player, player.getLastFolkNPC()); if (item == null) { - LOGGER.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index ee78579ea4..8a2f42272a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket { @@ -54,7 +55,7 @@ public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket } else { - LOGGER.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); + PacketLogger.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); } player.onTransactionRequest(requestor); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index afc4e65df4..08ad2c7763 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @version $Revision: 1.7.2.3.2.6 $ $Date: 2005/03/27 15:29:30 $ @@ -139,7 +140,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if ((player.getClan() == null) || (player.getClan().getHideoutId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.CLANHALL); @@ -167,7 +168,7 @@ public class RequestRestartPoint implements IClientIncomingPacket } else { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); return; } } @@ -199,7 +200,7 @@ public class RequestRestartPoint implements IClientIncomingPacket final Clan clan = player.getClan(); if ((clan == null) || (clan.getFortId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.FORTRESS); @@ -231,7 +232,7 @@ public class RequestRestartPoint implements IClientIncomingPacket if (((siegeClan == null) || siegeClan.getFlag().isEmpty())) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.SIEGEFLAG); @@ -241,7 +242,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if (!player.isGM() && !player.getInventory().haveItemForSelfResurrection()) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); return; } if (player.isGM() || player.destroyItemByItemId("Feather", 10649, 1, player, false) || player.destroyItemByItemId("Feather", 13300, 1, player, false) || player.destroyItemByItemId("Feather", 13128, 1, player, false)) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index cd8e900014..3582b308eb 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExNoticePostSent; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -316,14 +317,14 @@ public class RequestSendPost implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getObjectId(), i.getCount(), "attach"); if ((oldItem == null) || !oldItem.isTradeable() || oldItem.isEquipped()) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); return false; } final Item newItem = player.getInventory().transferItem("SendMail", i.getObjectId(), i.getCount(), attachments, player, msg.getReceiverName() + "[" + msg.getReceiverId() + "]"); if (newItem == null) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java index 2a33016c9a..b5d130046c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -54,16 +55,16 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket final Castle castle = CastleManager.getInstance().getCastleById(_castleId); if ((player == null) || (castle == null)) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); return; } if ((castle.getOwnerId() > 0) && (castle.getOwnerId() != player.getClanId())) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); } else if (!player.isClanLeader()) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); } else if (!castle.isTimeRegistrationOver()) { @@ -79,12 +80,12 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); } } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); } } 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 899777642d..4e71d6d57e 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 @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; @@ -112,7 +113,7 @@ public class Say2 implements IClientIncomingPacket ChatType chatType = ChatType.findByClientId(_type); if (chatType == null) { - LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); + PacketLogger.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -120,7 +121,7 @@ public class Say2 implements IClientIncomingPacket if (_text.isEmpty()) { - LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); + PacketLogger.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -214,7 +215,7 @@ public class Say2 implements IClientIncomingPacket } else { - LOGGER.info("No handler registered for ChatType: " + _type + " Player: " + client); + PacketLogger.info("No handler registered for ChatType: " + _type + " Player: " + client); } } @@ -260,7 +261,7 @@ public class Say2 implements IClientIncomingPacket final Item item = owner.getInventory().getItemByObjectId(id); if (item == null) { - LOGGER.info(client + " trying publish item which doesnt own! ID:" + id); + PacketLogger.info(client + " trying publish item which doesnt own! ID:" + id); return false; } item.publish(); @@ -268,7 +269,7 @@ public class Say2 implements IClientIncomingPacket pos1 = _text.indexOf(8, pos) + 1; if (pos1 == 0) // missing ending tag { - LOGGER.info(client + " sent invalid publish item msg! ID:" + id); + PacketLogger.info(client + " sent invalid publish item msg! ID:" + id); return false; } } 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 f89be1cfcb..84b879e0f7 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 @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -127,7 +128,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item item = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); return; } @@ -174,7 +175,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } @@ -186,7 +187,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem(warehouse.getName(), itemHolder.getId(), itemHolder.getCount(), warehouse, player, manager); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 1b5eb14605..984b90ec48 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; @@ -156,14 +157,14 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket final Item oldItem = warehouse.getItemByObjectId(i.getId()); if ((oldItem == null) || (oldItem.getCount() < i.getCount())) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } final Item newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, player.getLastFolkNPC()); if (newItem == null) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); return; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 65d55dac0c..d7f0dc28ec 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExShowVariationMakeWindow; @@ -282,7 +283,7 @@ public class UseItem implements IClientIncomingPacket { if ((etcItem != null) && (etcItem.getHandlerName() != null)) { - LOGGER.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); + PacketLogger.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); } } else if (handler.useItem(player, item, _ctrlPressed)) 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 36f9206cb0..ece66b1cd9 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -56,12 +57,12 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final SkillHolder holder = new SkillHolder(packet.readD(), packet.readD()); if (holder.getSkillLevel() < 1) { - LOGGER.warning("Player " + client + " is trying to learn skill " + holder + " by sending packet with level 0!"); + PacketLogger.warning("Player " + client + " is trying to learn skill " + holder + " by sending packet with level 0!"); return false; } if (_skills.putIfAbsent(holder.getSkillId(), holder) != null) { - LOGGER.warning("Player " + client + " is trying to send two times one skill " + holder + " to learn!"); + PacketLogger.warning("Player " + client + " is trying to send two times one skill " + holder + " to learn!"); return false; } } @@ -85,7 +86,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket if ((player.getAbilityPoints() == 0) || (player.getAbilityPoints() == player.getAbilityPointsUsed())) { - LOGGER.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); return; } @@ -114,7 +115,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final SkillLearn learn = SkillTreeData.getInstance().getAbilitySkill(holder.getSkillId(), holder.getSkillLevel()); if (learn == null) { - LOGGER.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); + PacketLogger.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); client.sendPacket(ActionFailed.STATIC_PACKET); break; } @@ -122,7 +123,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final Skill skill = holder.getSkill(); if (skill == null) { - LOGGER.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); + PacketLogger.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); client.sendPacket(ActionFailed.STATIC_PACKET); break; } @@ -155,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]) { - LOGGER.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!"); + PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -165,7 +166,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket { if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel()) { - LOGGER.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); + PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -174,7 +175,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 3 Learning a skill without having enough points if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points) { - LOGGER.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java index d9a7fcb4cb..d25abdb61e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -98,13 +99,13 @@ public class RequestAlchemyConversion implements IClientIncomingPacket if (data == null) { player.sendPacket(new ExAlchemyConversion(0, 0)); - LOGGER.warning("Missing AlchemyData for skillId: " + _skillId + ", skillLevel: " + _skillLevel); + PacketLogger.warning("Missing AlchemyData for skillId: " + _skillId + ", skillLevel: " + _skillLevel); return; } // if (!_ingredients.equals(data.getIngredients())) // { - // LOGGER.warning("Client ingredients are not same as server ingredients for alchemy conversion player: "+ +"", player); + // PacketLogger.warning("Client ingredients are not same as server ingredients for alchemy conversion player: "+ +"", player); // return; // } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index 68da085e66..a36649b520 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -74,7 +75,7 @@ public class RequestAlchemyTryMixCube implements IClientIncomingPacket else // Player used packet injection tool. { final Player player = client.getPlayer(); - LOGGER.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName()); + PacketLogger.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName()); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return false; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java index 71532ab900..8173c9700e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.PlaySound; import org.l2jmobius.gameserver.network.serverpackets.classchange.ExClassChangeSetAlarm; @@ -89,7 +90,7 @@ public class ExRequestClassChange implements IClientIncomingPacket if (!canChange // && (_classId != 170) && (player.getClassId().getId() != 133)) // Female Soul Hound fix. { - LOGGER.warning(player + " tried to change class from " + player.getClassId() + " to " + ClassId.getClassId(_classId) + "!"); + PacketLogger.warning(player + " tried to change class from " + player.getClassId() + " to " + ClassId.getClassId(_classId) + "!"); 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 20d84a2bd6..6b2f96e87d 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; @@ -60,37 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - LOGGER.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 30% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 100% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - LOGGER.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - - LOGGER.warning("Player " + player + ": Auction House (15-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); return; - } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - LOGGER.warning("Player " + player + ": Auction House (30-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + 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/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index e09225bec1..9d5edbda7a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -94,7 +95,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning(player + ": tried to crystallize " + item.getItem()); + PacketLogger.warning(player + ": tried to crystallize " + item.getItem()); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index 6a17e5856a..1465b00631 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets.ensoul; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnsoulData; import org.l2jmobius.gameserver.enums.PrivateStoreType; @@ -28,6 +26,7 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -39,7 +38,6 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; */ public class RequestItemEnsoul implements IClientIncomingPacket { - private static final Logger LOGGER = Logger.getLogger(RequestItemEnsoul.class.getName()); private int _itemObjectId; private EnsoulItemOption[] _options; @@ -119,37 +117,37 @@ public class RequestItemEnsoul implements IClientIncomingPacket final Item item = player.getInventory().getItemByObjectId(_itemObjectId); if (item == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item without having it!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item without having it!"); return; } if (!item.isEquipable()) { - LOGGER.warning("Player: " + player + " attempting to ensoul non equippable item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul non equippable item: " + item + "!"); return; } if (!item.isWeapon()) { - LOGGER.warning("Player: " + player + " attempting to ensoul item that's not a weapon: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item that's not a weapon: " + item + "!"); return; } if (item.isCommonItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul common item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul common item: " + item + "!"); return; } if (item.isShadowItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul shadow item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul shadow item: " + item + "!"); return; } if (item.isHeroItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul hero item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul hero item: " + item + "!"); return; } if ((_options == null) || (_options.length == 0)) { - LOGGER.warning("Player: " + player + " attempting to ensoul item without any special ability declared!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item without any special ability declared!"); return; } @@ -173,14 +171,14 @@ public class RequestItemEnsoul implements IClientIncomingPacket if (!stone.getOptions().contains(itemOption.getSoulCrystalOption())) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that stone doesn't contains!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that stone doesn't contains!"); continue; } final EnsoulOption option = EnsoulData.getInstance().getOption(itemOption.getSoulCrystalOption()); if (option == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that doesn't exists!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that doesn't exists!"); continue; } @@ -205,13 +203,13 @@ public class RequestItemEnsoul implements IClientIncomingPacket } else { - LOGGER.warning("Player: " + player + " attempting to ensoul item option with unhandled type: " + itemOption.getType() + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option with unhandled type: " + itemOption.getType() + "!"); continue; } if (fee == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that doesn't exists! (unknown fee)"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that doesn't exists! (unknown fee)"); continue; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java index b12c280c6d..635799d26b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java @@ -18,12 +18,12 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -102,7 +102,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e); + PacketLogger.warning("Could not add friend objectid: " + e.getMessage()); } } else diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java index 2dad174d89..73cd9a6a4b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -26,6 +25,7 @@ import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -99,7 +99,7 @@ public class RequestFriendDel implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not del friend objectid: ", e); + PacketLogger.warning("Could not del friend objectid: " + e.getMessage()); } } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java index acd698e706..da4a9fc815 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.model.homunculus.Homunculus; import org.l2jmobius.gameserver.model.homunculus.HomunculusTemplate; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.homunculus.ExHomunculusSummonResult; import org.l2jmobius.gameserver.network.serverpackets.homunculus.ExShowHomunculusBirthInfo; @@ -210,7 +211,7 @@ public class RequestExHomunculusSummon implements IClientIncomingPacket final HomunculusTemplate template = HomunculusData.getInstance().getTemplate(homunculusId); if (template == null) { - LOGGER.warning("Counld not find Homunculus template " + homunculusId + "."); + PacketLogger.warning("Counld not find Homunculus template " + homunculusId + "."); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExSummonHomunculusCouponResult.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExSummonHomunculusCouponResult.java index ea4a53ecd3..dfec52bbb8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExSummonHomunculusCouponResult.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExSummonHomunculusCouponResult.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.homunculus.Homunculus; import org.l2jmobius.gameserver.model.homunculus.HomunculusTemplate; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.homunculus.ExShowHomunculusBirthInfo; import org.l2jmobius.gameserver.network.serverpackets.homunculus.ExShowHomunculusList; @@ -216,7 +217,7 @@ public class RequestExSummonHomunculusCouponResult implements IClientIncomingPac final HomunculusTemplate template = HomunculusData.getInstance().getTemplate(homunculusId); if (template == null) { - LOGGER.warning("Could not find Homunculus template " + homunculusId + "."); + PacketLogger.warning("Could not find Homunculus template " + homunculusId + "."); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index 7afab50b4f..5f884b565a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.mentoring; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMenteeAdd; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -93,7 +93,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, e.getMessage(), e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index 41700d0f61..39121a166d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; @@ -56,7 +57,7 @@ public class RequestExPledgeMissionReward implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { - LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); + PacketLogger.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java index ee8910d06e..a53878b794 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductList; @@ -60,7 +61,7 @@ public class RequestBRProductList implements IClientIncomingPacket } default: { - LOGGER.warning(player + " send unhandled product list type: " + _type); + PacketLogger.warning(player + " send unhandled product list type: " + _type); break; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java index 10c89bed0e..f29aabd0cb 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java @@ -51,7 +51,7 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket } else { - // LOGGER.warning("Could not find spawn info for boss " + bossId + "."); + // PacketLogger.warning("Could not find spawn info for boss " + bossId + "."); } } else diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java index e83bf335a7..a828073bb9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.SayuneRequest; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.type.SayuneZone; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; @@ -72,7 +73,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (zone.getMapId() == -1) { player.sendMessage("That zone is not supported yet!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); return; } @@ -80,7 +81,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (map == null) { player.sendMessage("This zone is not handled yet!!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java index f1ede4ef0a..41648f184f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Shuttle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -60,7 +61,7 @@ public class RequestShuttleGetOn implements IClientIncomingPacket player.getInVehiclePosition().setXYZ(_x, _y, _z); break; } - LOGGER.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); + PacketLogger.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); } } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleport.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleport.java index b783c9696c..2e5317f897 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleport.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleport.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.holders.TeleportListHolder; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; @@ -55,7 +56,7 @@ public class ExRequestTeleport implements IClientIncomingPacket final TeleportListHolder teleport = TeleportListData.getInstance().getTeleport(_teleportId); if (teleport == null) { - LOGGER.warning("No registered teleport location for id: " + _teleportId); + PacketLogger.warning("No registered teleport location for id: " + _teleportId); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoritesAddDel.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoritesAddDel.java index a5b01e87b5..50f4b4d87d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoritesAddDel.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoritesAddDel.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.data.xml.TeleportListData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -53,7 +54,7 @@ public class ExRequestTeleportFavoritesAddDel implements IClientIncomingPacket if (TeleportListData.getInstance().getTeleport(_teleportId) == null) { - LOGGER.warning("No registered teleport location for id: " + _teleportId); + PacketLogger.warning("No registered teleport location for id: " + _teleportId); return; } @@ -62,7 +63,7 @@ public class ExRequestTeleportFavoritesAddDel implements IClientIncomingPacket { if (TeleportListData.getInstance().getTeleport(_teleportId) == null) { - LOGGER.warning("No registered teleport location for id: " + _teleportId); + PacketLogger.warning("No registered teleport location for id: " + _teleportId); } else { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 33eeff5060..1b8ddb2042 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -16,11 +16,10 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Level; - import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.util.Util; /** @@ -75,7 +74,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { if (html.length() > 17200) { - LOGGER.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable()); + PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } @@ -94,7 +93,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket if (content == null) { setHtml("My Text is missing:
" + path + ""); - LOGGER.warning("missing html page " + path); + PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index e6b4b8b604..57ed88ac29 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; /** @@ -46,7 +47,7 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index d94dbf4403..75f6596194 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Migi, DS @@ -44,7 +45,7 @@ public class ExReplySentPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index b0f3738683..15d011befc 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author KenM @@ -54,7 +55,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); + PacketLogger.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); packet.writeS(""); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index d588f1c7cf..b5c8628b50 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IOutgoingPacket; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; @@ -28,8 +26,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; */ public interface IClientOutgoingPacket extends IOutgoingPacket { - Logger LOGGER = Logger.getLogger(IClientOutgoingPacket.class.getName()); - int[] PAPERDOLL_ORDER = new int[] { Inventory.PAPERDOLL_UNDER, diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 29a4f31530..79d478aff9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan.SubPledge; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author -Wooden- @@ -56,7 +57,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket } else if (_clan.getClanMember(LeaderId) == null) { - LOGGER.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); + PacketLogger.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); return ""; } else diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index a95e7ab97c..d9c2621c84 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.RecipeData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.RecipeHolder; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class RecipeItemMakeInfo implements IClientOutgoingPacket { @@ -77,7 +78,8 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeQ(_offeringMaximumAdena); // Adena worth of items for maximum offering. return true; } - LOGGER.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); + + PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 432ff8ad7f..0a3fe46cb7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Shows the Siege Info
@@ -78,7 +79,7 @@ public class SiegeInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Null owner for castle: " + _castle.getName()); + PacketLogger.warning("Null owner for castle: " + _castle.getName()); } } else diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 44f290e92f..746b2da3f7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; @@ -157,7 +158,7 @@ public class SystemMessage implements IClientOutgoingPacket // Mobius: With additional on-screen damage param (popup), length is increased. if (param.getType() != TYPE_POPUP_ID) { - LOGGER.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); + PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } @@ -414,7 +415,7 @@ public class SystemMessage implements IClientOutgoingPacket { if (param == null) { - LOGGER.warning("Found null parameter for SystemMessageId " + _smId); + PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 37150ec357..7af1cd273c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -24,6 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class WareHouseWithdrawalList extends AbstractItemPacket { @@ -56,7 +57,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket _invSize = player.getInventory().getSize(); if (_player.getActiveWarehouse() == null) { - LOGGER.warning("error while sending withdraw request to: " + _player.getName()); + PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java index a63178770a..d1896f32a7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.instancemanager.RankManager; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; /** @@ -134,7 +135,7 @@ public class ExOlympiadHeroAndLegendInfo implements IClientOutgoingPacket } catch (SQLException e) { - LOGGER.warning("Hero and Legend Info: Couldnt load data: " + e.getMessage()); + PacketLogger.warning("Hero and Legend Info: Couldnt load data: " + e.getMessage()); } } return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java index 710d957175..b7395dee4e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; /** @@ -96,7 +97,7 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket } catch (SQLException e) { - LOGGER.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); + PacketLogger.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); } int previousPlace = 0; @@ -125,7 +126,7 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket } catch (SQLException e) { - LOGGER.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); + PacketLogger.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); } int heroCount = 0; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/PacketLogger.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/PacketLogger.java new file mode 100644 index 0000000000..5b5a083a99 --- /dev/null +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/PacketLogger.java @@ -0,0 +1,42 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.network; + +import java.util.logging.Logger; + +/** + * @author Mobius + */ +public class PacketLogger +{ + private static final Logger LOGGER = Logger.getLogger(PacketLogger.class.getName()); + + public static synchronized void warning(String message) + { + LOGGER.warning(message); + } + + public static synchronized void info(String message) + { + LOGGER.info(message); + } + + public static synchronized void finer(String message) + { + LOGGER.finer(message); + } +} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 7c343f78be..ef3f4acc18 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -161,7 +162,7 @@ public class Action implements IClientIncomingPacket default: { // Invalid action detected (probably client cheating), log this - LOGGER.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); + PacketLogger.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); client.sendPacket(ActionFailed.STATIC_PACKET); break; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index 31d29ef3dd..8e8ae2c190 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; import org.l2jmobius.gameserver.network.serverpackets.TradeOwnAdd; @@ -58,7 +59,7 @@ public class AddTradeItem implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - LOGGER.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); + PacketLogger.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); return; } @@ -68,7 +69,7 @@ public class AddTradeItem implements IClientIncomingPacket // Trade partner not found, cancel trade if (partner != null) { - LOGGER.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); + PacketLogger.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); } player.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE); player.cancelActiveTrade(); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 20134dd2bb..a3236b0d83 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -62,7 +62,7 @@ public class CannotMoveAnymore implements IClientIncomingPacket // player.stopMove(); // // if (Config.DEBUG) - // LOGGER.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ + // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); // StopMove smwl = new StopMove(player); // client.getPlayer().sendPacket(smwl); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 1872b6fa54..2a1beff259 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -46,6 +46,7 @@ import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; import org.l2jmobius.gameserver.network.serverpackets.CharCreateOk; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -127,21 +128,21 @@ public class CharacterCreate implements IClientIncomingPacket if ((_face > 2) || (_face < 0)) { - LOGGER.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairStyle < 0) || ((_sex == 0) && (_hairStyle > 4)) || ((_sex != 0) && (_hairStyle > 6))) { - LOGGER.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairColor > 3) || (_hairColor < 0)) { - LOGGER.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } @@ -345,7 +346,7 @@ public class CharacterCreate implements IClientIncomingPacket final Item item = newChar.getInventory().addItem("Init", ie.getId(), ie.getCount(), newChar, null); if (item == null) { - LOGGER.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); + PacketLogger.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); continue; } @@ -362,7 +363,7 @@ public class CharacterCreate implements IClientIncomingPacket final Item item = newChar.getInventory().addItem("Balthus Rewards", reward.getId(), reward.getCount(), newChar, null); if (item == null) { - LOGGER.warning("Could not create item during char creation: itemId " + reward.getId() + ", amount " + reward.getCount() + "."); + PacketLogger.warning("Could not create item during char creation: itemId " + reward.getId() + ", amount " + reward.getCount() + "."); continue; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java index 86c425fa45..63c3261946 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Level; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.CharacterDeleteFailType; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -25,6 +23,7 @@ import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDelete; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteFail; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteSuccess; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -74,7 +73,7 @@ public class CharacterDelete implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Error:", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1, 0); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java index 5f74c38273..cfe9b20f3d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java @@ -47,7 +47,7 @@ public class EndScenePlayer implements IClientIncomingPacket final MovieHolder holder = player.getMovieHolder(); if ((holder == null) || (holder.getMovie().getClientId() != _movieId)) { - // LOGGER.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); + // PacketLogger.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index e329258bbe..91ceee0470 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -71,6 +71,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.Die; @@ -161,7 +162,7 @@ public class EnterWorld implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.warning("EnterWorld failed! player returned 'null'."); + PacketLogger.warning("EnterWorld failed! player returned 'null'."); Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java index 8bde20da0a..14e8153478 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java @@ -25,9 +25,13 @@ import org.l2jmobius.gameserver.network.GameClient; */ public class ExGetOnAirShip implements IClientIncomingPacket { + @SuppressWarnings("unused") private int _x; + @SuppressWarnings("unused") private int _y; + @SuppressWarnings("unused") private int _z; + @SuppressWarnings("unused") private int _shipId; @Override @@ -43,9 +47,9 @@ public class ExGetOnAirShip implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("[T1:ExGetOnAirShip] x: " + _x); - LOGGER.info("[T1:ExGetOnAirShip] y: " + _y); - LOGGER.info("[T1:ExGetOnAirShip] z: " + _z); - LOGGER.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); + // PacketLogger.info("[T1:ExGetOnAirShip] x: " + _x); + // PacketLogger.info("[T1:ExGetOnAirShip] y: " + _y); + // PacketLogger.info("[T1:ExGetOnAirShip] z: " + _z); + // PacketLogger.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ExOpenHtml.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ExOpenHtml.java index 776e0703d6..fb19d3a828 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ExOpenHtml.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ExOpenHtml.java @@ -21,6 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ExPremiumManagerShowHtml; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -77,7 +78,7 @@ public class ExOpenHtml implements IClientIncomingPacket } default: { - LOGGER.warning("Unknown ExOpenHtml type (" + _type + ")"); + PacketLogger.warning("Unknown ExOpenHtml type (" + _type + ")"); break; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java index fcdd8335f4..4e91188f5c 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java @@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Arrays; -import java.util.logging.Level; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: c dddd @@ -79,7 +79,7 @@ public class GameGuardReply implements IClientIncomingPacket } catch (NoSuchAlgorithmException e) { - LOGGER.log(Level.WARNING, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java index eddff9f891..62e69acd86 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.gameserver.network.GameClient; @@ -27,5 +25,4 @@ import org.l2jmobius.gameserver.network.GameClient; */ public interface IClientIncomingPacket extends IIncomingPacket { - Logger LOGGER = Logger.getLogger(IClientIncomingPacket.class.getName()); } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 8ff8d6ef9a..3b9960aef4 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -153,7 +154,7 @@ public class MultiSellChoose implements IClientIncomingPacket if (((_soulCrystalOptions != null) && CommonUtil.contains(_soulCrystalOptions, null)) || ((_soulCrystalSpecialOptions != null) && CommonUtil.contains(_soulCrystalSpecialOptions, null))) { - LOGGER.severe("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -161,14 +162,14 @@ public class MultiSellChoose implements IClientIncomingPacket final MultisellEntryHolder entry = list.getEntries().get(_entryId - 1); // Entry Id begins from 1. We currently use entry IDs as index pointer. if (entry == null) { - LOGGER.severe("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } if (!entry.isStackable() && (_amount > 1)) { - LOGGER.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -196,7 +197,7 @@ public class MultiSellChoose implements IClientIncomingPacket )) //@formatter:on { - LOGGER.severe("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -372,7 +373,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); return; } } @@ -487,7 +488,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); return; } } @@ -691,7 +692,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); + PacketLogger.warning("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); return false; } } 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 f778c388f5..0c9ba62406 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 @@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillDone; import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; @@ -104,7 +105,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if ((_level < 1) || (_level > 1000) || (_id < 1) || (_id > 64000)) { Util.handleIllegalPlayerAction(player, "Wrong Packet Data in Aquired Skill", Config.DEFAULT_PUNISH); - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); return; } @@ -118,7 +119,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - LOGGER.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -450,7 +451,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket } default: { - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); break; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 0a570fd3ef..4bb789645a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillInfo; import org.l2jmobius.gameserver.network.serverpackets.ExAcquireSkillInfo; @@ -55,7 +56,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket { if ((_id <= 0) || (_level <= 0)) { - LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); return; } @@ -74,7 +75,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level); if (skill == null) { - LOGGER.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); + PacketLogger.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); return; } 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 5e0a2af0c9..8078d0c10e 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.Arrays; -import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.ActionData; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; @@ -41,8 +41,6 @@ import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList; */ public class RequestActionUse implements IClientIncomingPacket { - private static final Logger LOGGER = Logger.getLogger(RequestActionUse.class.getName()); - private int _actionId; private boolean _ctrlPressed; private boolean _shiftPressed; @@ -93,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } @@ -107,7 +105,7 @@ public class RequestActionUse implements IClientIncomingPacket actionHandler.useAction(player, actionHolder, _ctrlPressed, _shiftPressed); return; } - LOGGER.warning("Couldnt find handler with name: " + actionHolder.getHandler()); + PacketLogger.warning("Couldn't find handler with name: " + actionHolder.getHandler()); return; } @@ -143,7 +141,7 @@ public class RequestActionUse implements IClientIncomingPacket } default: { - LOGGER.warning(player.getName() + ": unhandled action type " + _actionId); + PacketLogger.warning(player.getName() + ": unhandled action type " + _actionId); break; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoUse.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoUse.java index 0729d6656c..f33a0c4567 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoUse.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoUse.java @@ -27,30 +27,30 @@ public class RequestAutoUse implements IClientIncomingPacket @Override public boolean read(GameClient client, PacketReader packet) { - final int unk1 = packet.readC(); // C - true. This is summary amount of next data received. - LOGGER.info("received packet RequestAutoUse with unk1:" + unk1); - final int unk2 = packet.readC(); - LOGGER.info("and unk2: " + unk2); - final int unk3 = packet.readC(); // Can target mobs, that attacked by other players? - LOGGER.info("and unk3: " + unk3); - final int unk4 = packet.readC(); // Auto pickup? - LOGGER.info("and unk4: " + unk4); - final int unk5 = packet.readC(); - LOGGER.info("and unk5: " + unk5); - final int unk6 = packet.readC(); - LOGGER.info("and unk6: " + unk6); - final int unk7 = packet.readC(); // short range :1; long: 0 - LOGGER.info("and unk7: " + unk7); - final int unk8 = packet.readC(); // received 51 when logged in game... - LOGGER.info("and unk8: " + unk8); - final int unk9 = packet.readC(); - LOGGER.info("and unk9: " + unk9); - final int unk10 = packet.readC(); - LOGGER.info("and unk10: " + unk10); - final int unk11 = packet.readC(); - LOGGER.info("and unk11: " + unk11); - final int unk12 = packet.readC(); // enable/ disable? - LOGGER.info("and unk12: " + unk12); + // final int unk1 = packet.readC(); // C - true. This is summary amount of next data received. + // PacketLogger.info("received packet RequestAutoUse with unk1:" + unk1); + // final int unk2 = packet.readC(); + // PacketLogger.info("and unk2: " + unk2); + // final int unk3 = packet.readC(); // Can target mobs, that attacked by other players? + // PacketLogger.info("and unk3: " + unk3); + // final int unk4 = packet.readC(); // Auto pickup? + // PacketLogger.info("and unk4: " + unk4); + // final int unk5 = packet.readC(); + // PacketLogger.info("and unk5: " + unk5); + // final int unk6 = packet.readC(); + // PacketLogger.info("and unk6: " + unk6); + // final int unk7 = packet.readC(); // short range :1; long: 0 + // PacketLogger.info("and unk7: " + unk7); + // final int unk8 = packet.readC(); // received 51 when logged in game... + // PacketLogger.info("and unk8: " + unk8); + // final int unk9 = packet.readC(); + // PacketLogger.info("and unk9: " + unk9); + // final int unk10 = packet.readC(); + // PacketLogger.info("and unk10: " + unk10); + // final int unk11 = packet.readC(); + // PacketLogger.info("and unk11: " + unk11); + // final int unk12 = packet.readC(); // enable/ disable? + // PacketLogger.info("and unk12: " + unk12); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java index 1fa1214bea..76649875f1 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.data.xml.FakePlayerData; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -130,7 +131,7 @@ public class RequestBlock implements IClientIncomingPacket } default: { - LOGGER.info("Unknown 0xA9 block type: " + _type); + PacketLogger.info("Unknown 0xA9 block type: " + _type); } } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index eb7e62ebf2..ce3d851f06 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -161,7 +162,7 @@ public class RequestBuyItem implements IClientIncomingPacket long price = product.getPrice(); if (price < 0) { - LOGGER.warning("ERROR, no price found .. wrong buylist ??"); + PacketLogger.warning("ERROR, no price found .. wrong buylist ??"); client.sendPacket(ActionFailed.STATIC_PACKET); 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 47214311ac..4d8e55bc8e 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.StringTokenizer; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -43,6 +42,7 @@ import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -90,7 +90,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -194,7 +194,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (NumberFormatException nfe) { - LOGGER.log(Level.WARNING, "NFE for command [" + _command + "]", nfe); + PacketLogger.warning("NFE for command [" + _command + "] " + nfe.getMessage()); } } else if (_command.startsWith("_match")) @@ -295,13 +295,13 @@ public class RequestBypassToServer implements IClientIncomingPacket } else { - LOGGER.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); + PacketLogger.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); } } } catch (Exception e) { - LOGGER.log(Level.WARNING, "Exception processing bypass from player " + player.getName() + ": " + _command, e); + PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _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/RequestCrystallizeItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index c140d42b69..e0443b72b7 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -59,7 +60,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.finer("RequestCrystalizeItem: activeChar was null"); + // PacketLogger.finer("RequestCrystalizeItem: activeChar was null."); return; } @@ -87,7 +88,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - LOGGER.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 4f351a636b..cb90d581c8 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; @@ -33,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -169,7 +169,7 @@ public class RequestDestroyItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not delete pet objectid: ", e); + PacketLogger.warning("Could not delete pet objectid: " + e.getMessage()); } } if (itemToRemove.isTimeLimitedItem()) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 0e4b623bb3..b7d4ac63a9 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.GMAudit; import org.l2jmobius.gameserver.util.Util; @@ -210,7 +211,7 @@ public class RequestDropItem implements IClientIncomingPacket if ((dropedItem != null) && (dropedItem.getId() == Inventory.ADENA_ID) && (dropedItem.getCount() >= 1000000)) { final String msg = "Character (" + player.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")"; - LOGGER.warning(msg); + PacketLogger.warning(msg); AdminData.getInstance().broadcastMessageToGMs(msg); } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java index e3ab837779..e8bfc249c9 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ExNeedToChangeName; /** @@ -42,6 +43,6 @@ public class RequestExChangeName implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); + PacketLogger.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java index 6e4861568e..c2f02f89ad 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chdd d: Arena d: Team @@ -74,7 +75,7 @@ public class RequestExCubeGameChangeTeam implements IClientIncomingPacket } default: { - LOGGER.warning("Wrong Cube Game Team ID: " + _team); + PacketLogger.warning("Wrong Cube Game Team ID: " + _team); break; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java index 009b836b6d..d72fdfc413 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chddd d: Arena d: Answer @@ -64,7 +65,7 @@ public class RequestExCubeGameReadyAnswer implements IClientIncomingPacket } default: { - LOGGER.warning("Unknown Cube Game Answer ID: " + _answer); + PacketLogger.warning("Unknown Cube Game Answer ID: " + _answer); break; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java index ff12adb20d..3347f01941 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) just a trigger @@ -34,6 +35,6 @@ public class RequestExFishRanking implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestExFishRanking"); + PacketLogger.info("C5: RequestExFishRanking"); } } \ No newline at end of file diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 57e8e7d2e5..8851aef463 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; import org.l2jmobius.gameserver.util.Broadcast; @@ -86,7 +87,7 @@ public class RequestExMagicSkillUseGround implements IClientIncomingPacket else { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("No skill found with id " + _skillId + " and level " + level + " !!"); + PacketLogger.warning("No skill found with id " + _skillId + " and level " + level + " !!"); } } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 77093c5f2d..2d9f0456f4 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; @@ -73,7 +74,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket client.sendPacket(new ExPutEnchantTargetItemResult(0)); if (scrollTemplate == null) { - LOGGER.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); + PacketLogger.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); } return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java index 05e09e6dfc..0a4522bf64 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressMapInfo; @@ -43,7 +44,7 @@ public class RequestFortressMapInfo implements IClientIncomingPacket final Fort fort = FortManager.getInstance().getFortById(_fortressId); if (fort == null) { - LOGGER.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); + PacketLogger.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); if (client.getPlayer() == null) { 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 f65a63d325..dc903790d0 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 @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) d @@ -44,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - LOGGER.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning("Player " + 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/RequestGetItemFromPet.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index a9fd8d923a..48e75fc61b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.util.Util; @@ -84,7 +85,7 @@ public class RequestGetItemFromPet implements IClientIncomingPacket } else { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 79e1193ac0..22f2f24422 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.util.Util; @@ -124,7 +125,7 @@ public class RequestGiveItemToPet implements IClientIncomingPacket } else { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } 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 5d9ff7b557..822c7231bc 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 @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaEquipList; @@ -60,7 +61,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.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 fa21b68043..a7c019d65d 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; @@ -52,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - LOGGER.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); } client.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 b943775334..ff96a400c9 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; @@ -50,10 +51,11 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.sendPacket(ActionFailed.STATIC_PACKET); return; } + player.sendPacket(new HennaItemRemoveInfo(henna, player)); } } 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 f511a8e30d..732efa0d71 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -76,7 +77,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); client.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 53f04488a6..ada67e190c 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -49,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - LOGGER.warning("Player " + actor.getName() + " sent empty html link!"); + PacketLogger.warning("Player " + actor.getName() + " sent empty html link!"); return; } if (_link.contains("..")) { - LOGGER.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); return; } final int htmlObjectId = actor.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - LOGGER.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java index 89adeae67b..2e1c1c83f6 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author UnAfraid @@ -51,7 +52,7 @@ public class RequestMagicSkillList implements IClientIncomingPacket if (player.getObjectId() != _objectId) { - LOGGER.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); + PacketLogger.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 9432941937..a228079092 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -64,7 +64,7 @@ public class RequestMagicSkillUse implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); // if (_magicId > 0) // { - // LOGGER.warning("Skill Id " + _magicId + " not found in player: " + player); + // PacketLogger.warning("Skill Id " + _magicId + " not found in player: " + player); // } return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 5fbcac0eca..9149ce1284 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListDelete; @@ -71,7 +72,7 @@ public class RequestOustPledgeMember implements IClientIncomingPacket final ClanMember member = clan.getClanMember(_target); if (member == null) { - LOGGER.warning("Target (" + _target + ") is not member of the clan"); + PacketLogger.warning("Target (" + _target + ") is not member of the clan"); return; } if (member.isOnline() && member.getPlayer().isInCombat()) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java index 9702554c3b..209835b319 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) S @@ -37,6 +38,6 @@ public class RequestPCCafeCouponUse implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestPCCafeCouponUse: S: " + _str); + PacketLogger.info("C5: RequestPCCafeCouponUse: S: " + _str); } } 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 4d3adf25dc..e8de8fee2a 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 @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -113,7 +114,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item item = player.checkItemManipulation(i.getId(), i.getCount(), "freight"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); warehouse.deleteMe(); return; } @@ -162,7 +163,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); warehouse.deleteMe(); return; } @@ -170,7 +171,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem("Trade", i.getId(), i.getCount(), warehouse, player, null); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 2c715b4efb..0d858fb452 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -137,7 +138,7 @@ public class RequestPetUseItem implements IClientIncomingPacket else { player.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM); - LOGGER.warning("No item handler registered for itemId: " + item.getId()); + PacketLogger.warning("No item handler registered for itemId: " + item.getId()); } } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index 8ece2b3ec7..fec0dc36a0 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -25,6 +25,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Plim @@ -74,7 +75,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket } catch (SQLException e) { - LOGGER.severe("Error while saving petition feedback"); + PacketLogger.warning("Error while saving petition feedback."); } } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java index d212481717..3459b04c80 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java @@ -44,8 +44,8 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket @Override public void run(GameClient client) { - // LOGGER.info("C5: RequestPledgeMemberInfo d:"+_unk1); - // LOGGER.info("C5: RequestPledgeMemberInfo S:"+_player); + // PacketLogger.info("C5: RequestPledgeMemberInfo d:"+_unk1); + // PacketLogger.info("C5: RequestPledgeMemberInfo S:"+_player); final Player player = client.getPlayer(); if (player == null) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index e56c105cf4..44bbd9d34c 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.HashMap; import java.util.Map; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -38,6 +37,7 @@ import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; @@ -74,7 +74,7 @@ public class RequestPreviewItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } @@ -152,7 +152,7 @@ public class RequestPreviewItem implements IClientIncomingPacket final Merchant merchant = (target instanceof Merchant) ? (Merchant) target : null; if (merchant == null) { - LOGGER.warning("Null merchant!"); + PacketLogger.warning(getClass().getSimpleName() + ": Null merchant!"); 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 251757c0ba..94958bc4fe 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.util.Util; @@ -145,7 +146,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if (result > 1) { - LOGGER.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); } return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java index 9998465898..8ab3d4962f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; public class RequestPrivateStoreSell implements IClientIncomingPacket @@ -134,7 +135,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket if (!storeList.privateStoreSell(player, _items)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index a4010ca2cb..1632df189f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -193,7 +194,7 @@ public class RequestRefundItem implements IClientIncomingPacket final Item item = player.getRefund().transferItem("Refund", objectIds[i], Long.MAX_VALUE, player.getInventory(), player, player.getLastFolkNPC()); if (item == null) { - LOGGER.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index ee78579ea4..8a2f42272a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket { @@ -54,7 +55,7 @@ public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket } else { - LOGGER.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); + PacketLogger.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); } player.onTransactionRequest(requestor); } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index afc4e65df4..08ad2c7763 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @version $Revision: 1.7.2.3.2.6 $ $Date: 2005/03/27 15:29:30 $ @@ -139,7 +140,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if ((player.getClan() == null) || (player.getClan().getHideoutId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.CLANHALL); @@ -167,7 +168,7 @@ public class RequestRestartPoint implements IClientIncomingPacket } else { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); return; } } @@ -199,7 +200,7 @@ public class RequestRestartPoint implements IClientIncomingPacket final Clan clan = player.getClan(); if ((clan == null) || (clan.getFortId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.FORTRESS); @@ -231,7 +232,7 @@ public class RequestRestartPoint implements IClientIncomingPacket if (((siegeClan == null) || siegeClan.getFlag().isEmpty())) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.SIEGEFLAG); @@ -241,7 +242,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if (!player.isGM() && !player.getInventory().haveItemForSelfResurrection()) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); return; } if (player.isGM() || player.destroyItemByItemId("Feather", 10649, 1, player, false) || player.destroyItemByItemId("Feather", 13300, 1, player, false) || player.destroyItemByItemId("Feather", 13128, 1, player, false)) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index cd8e900014..3582b308eb 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExNoticePostSent; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -316,14 +317,14 @@ public class RequestSendPost implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getObjectId(), i.getCount(), "attach"); if ((oldItem == null) || !oldItem.isTradeable() || oldItem.isEquipped()) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); return false; } final Item newItem = player.getInventory().transferItem("SendMail", i.getObjectId(), i.getCount(), attachments, player, msg.getReceiverName() + "[" + msg.getReceiverId() + "]"); if (newItem == null) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java index 2a33016c9a..b5d130046c 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -54,16 +55,16 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket final Castle castle = CastleManager.getInstance().getCastleById(_castleId); if ((player == null) || (castle == null)) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); return; } if ((castle.getOwnerId() > 0) && (castle.getOwnerId() != player.getClanId())) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); } else if (!player.isClanLeader()) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); } else if (!castle.isTimeRegistrationOver()) { @@ -79,12 +80,12 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); } } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); } } 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 899777642d..4e71d6d57e 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 @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; @@ -112,7 +113,7 @@ public class Say2 implements IClientIncomingPacket ChatType chatType = ChatType.findByClientId(_type); if (chatType == null) { - LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); + PacketLogger.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -120,7 +121,7 @@ public class Say2 implements IClientIncomingPacket if (_text.isEmpty()) { - LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); + PacketLogger.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -214,7 +215,7 @@ public class Say2 implements IClientIncomingPacket } else { - LOGGER.info("No handler registered for ChatType: " + _type + " Player: " + client); + PacketLogger.info("No handler registered for ChatType: " + _type + " Player: " + client); } } @@ -260,7 +261,7 @@ public class Say2 implements IClientIncomingPacket final Item item = owner.getInventory().getItemByObjectId(id); if (item == null) { - LOGGER.info(client + " trying publish item which doesnt own! ID:" + id); + PacketLogger.info(client + " trying publish item which doesnt own! ID:" + id); return false; } item.publish(); @@ -268,7 +269,7 @@ public class Say2 implements IClientIncomingPacket pos1 = _text.indexOf(8, pos) + 1; if (pos1 == 0) // missing ending tag { - LOGGER.info(client + " sent invalid publish item msg! ID:" + id); + PacketLogger.info(client + " sent invalid publish item msg! ID:" + id); return false; } } 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 f89be1cfcb..84b879e0f7 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 @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -127,7 +128,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item item = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); return; } @@ -174,7 +175,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } @@ -186,7 +187,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem(warehouse.getName(), itemHolder.getId(), itemHolder.getCount(), warehouse, player, manager); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 1b5eb14605..984b90ec48 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; @@ -156,14 +157,14 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket final Item oldItem = warehouse.getItemByObjectId(i.getId()); if ((oldItem == null) || (oldItem.getCount() < i.getCount())) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } final Item newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, player.getLastFolkNPC()); if (newItem == null) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); return; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 65d55dac0c..d7f0dc28ec 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExShowVariationMakeWindow; @@ -282,7 +283,7 @@ public class UseItem implements IClientIncomingPacket { if ((etcItem != null) && (etcItem.getHandlerName() != null)) { - LOGGER.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); + PacketLogger.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); } } else if (handler.useItem(player, item, _ctrlPressed)) 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 36f9206cb0..ece66b1cd9 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -56,12 +57,12 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final SkillHolder holder = new SkillHolder(packet.readD(), packet.readD()); if (holder.getSkillLevel() < 1) { - LOGGER.warning("Player " + client + " is trying to learn skill " + holder + " by sending packet with level 0!"); + PacketLogger.warning("Player " + client + " is trying to learn skill " + holder + " by sending packet with level 0!"); return false; } if (_skills.putIfAbsent(holder.getSkillId(), holder) != null) { - LOGGER.warning("Player " + client + " is trying to send two times one skill " + holder + " to learn!"); + PacketLogger.warning("Player " + client + " is trying to send two times one skill " + holder + " to learn!"); return false; } } @@ -85,7 +86,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket if ((player.getAbilityPoints() == 0) || (player.getAbilityPoints() == player.getAbilityPointsUsed())) { - LOGGER.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); return; } @@ -114,7 +115,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final SkillLearn learn = SkillTreeData.getInstance().getAbilitySkill(holder.getSkillId(), holder.getSkillLevel()); if (learn == null) { - LOGGER.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); + PacketLogger.warning("SkillLearn " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); client.sendPacket(ActionFailed.STATIC_PACKET); break; } @@ -122,7 +123,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket final Skill skill = holder.getSkill(); if (skill == null) { - LOGGER.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); + PacketLogger.warning("Skill " + holder.getSkillId() + " (" + holder.getSkillLevel() + ") not found!"); client.sendPacket(ActionFailed.STATIC_PACKET); break; } @@ -155,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]) { - LOGGER.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!"); + PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without enough ability points spent!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -165,7 +166,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket { if (player.getSkillLevel(required.getSkillId()) < required.getSkillLevel()) { - LOGGER.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); + PacketLogger.warning("Player " + player + " is trying to learn " + skill + " without having prerequsite skill: " + required.getSkill() + "!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -174,7 +175,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket // Case 3 Learning a skill without having enough points if ((player.getAbilityPoints() - player.getAbilityPointsUsed()) < points) { - LOGGER.warning("Player " + player + " is trying to learn ability without ability points!"); + PacketLogger.warning("Player " + player + " is trying to learn ability without ability points!"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java index d9a7fcb4cb..d25abdb61e 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -98,13 +99,13 @@ public class RequestAlchemyConversion implements IClientIncomingPacket if (data == null) { player.sendPacket(new ExAlchemyConversion(0, 0)); - LOGGER.warning("Missing AlchemyData for skillId: " + _skillId + ", skillLevel: " + _skillLevel); + PacketLogger.warning("Missing AlchemyData for skillId: " + _skillId + ", skillLevel: " + _skillLevel); return; } // if (!_ingredients.equals(data.getIngredients())) // { - // LOGGER.warning("Client ingredients are not same as server ingredients for alchemy conversion player: "+ +"", player); + // PacketLogger.warning("Client ingredients are not same as server ingredients for alchemy conversion player: "+ +"", player); // return; // } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index 68da085e66..a36649b520 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -74,7 +75,7 @@ public class RequestAlchemyTryMixCube implements IClientIncomingPacket else // Player used packet injection tool. { final Player player = client.getPlayer(); - LOGGER.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName()); + PacketLogger.warning("Kicked " + player + " for using packet injection tool with " + getClass().getSimpleName()); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return false; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java index 71532ab900..8173c9700e 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.PlaySound; import org.l2jmobius.gameserver.network.serverpackets.classchange.ExClassChangeSetAlarm; @@ -89,7 +90,7 @@ public class ExRequestClassChange implements IClientIncomingPacket if (!canChange // && (_classId != 170) && (player.getClassId().getId() != 133)) // Female Soul Hound fix. { - LOGGER.warning(player + " tried to change class from " + player.getClassId() + " to " + ClassId.getClassId(_classId) + "!"); + PacketLogger.warning(player + " tried to change class from " + player.getClassId() + " to " + ClassId.getClassId(_classId) + "!"); 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 20d84a2bd6..6b2f96e87d 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; @@ -60,37 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - LOGGER.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 30% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 100% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - LOGGER.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - - LOGGER.warning("Player " + player + ": Auction House (15-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); return; - } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - LOGGER.warning("Player " + player + ": Auction House (30-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + 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/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index e09225bec1..9d5edbda7a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -94,7 +95,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning(player + ": tried to crystallize " + item.getItem()); + PacketLogger.warning(player + ": tried to crystallize " + item.getItem()); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index 6a17e5856a..1465b00631 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets.ensoul; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnsoulData; import org.l2jmobius.gameserver.enums.PrivateStoreType; @@ -28,6 +26,7 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -39,7 +38,6 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; */ public class RequestItemEnsoul implements IClientIncomingPacket { - private static final Logger LOGGER = Logger.getLogger(RequestItemEnsoul.class.getName()); private int _itemObjectId; private EnsoulItemOption[] _options; @@ -119,37 +117,37 @@ public class RequestItemEnsoul implements IClientIncomingPacket final Item item = player.getInventory().getItemByObjectId(_itemObjectId); if (item == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item without having it!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item without having it!"); return; } if (!item.isEquipable()) { - LOGGER.warning("Player: " + player + " attempting to ensoul non equippable item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul non equippable item: " + item + "!"); return; } if (!item.isWeapon()) { - LOGGER.warning("Player: " + player + " attempting to ensoul item that's not a weapon: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item that's not a weapon: " + item + "!"); return; } if (item.isCommonItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul common item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul common item: " + item + "!"); return; } if (item.isShadowItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul shadow item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul shadow item: " + item + "!"); return; } if (item.isHeroItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul hero item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul hero item: " + item + "!"); return; } if ((_options == null) || (_options.length == 0)) { - LOGGER.warning("Player: " + player + " attempting to ensoul item without any special ability declared!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item without any special ability declared!"); return; } @@ -173,14 +171,14 @@ public class RequestItemEnsoul implements IClientIncomingPacket if (!stone.getOptions().contains(itemOption.getSoulCrystalOption())) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that stone doesn't contains!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that stone doesn't contains!"); continue; } final EnsoulOption option = EnsoulData.getInstance().getOption(itemOption.getSoulCrystalOption()); if (option == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that doesn't exists!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that doesn't exists!"); continue; } @@ -205,13 +203,13 @@ public class RequestItemEnsoul implements IClientIncomingPacket } else { - LOGGER.warning("Player: " + player + " attempting to ensoul item option with unhandled type: " + itemOption.getType() + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option with unhandled type: " + itemOption.getType() + "!"); continue; } if (fee == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that doesn't exists! (unknown fee)"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that doesn't exists! (unknown fee)"); continue; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java index b12c280c6d..635799d26b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java @@ -18,12 +18,12 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -102,7 +102,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e); + PacketLogger.warning("Could not add friend objectid: " + e.getMessage()); } } else diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java index 2dad174d89..73cd9a6a4b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -26,6 +25,7 @@ import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -99,7 +99,7 @@ public class RequestFriendDel implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not del friend objectid: ", e); + PacketLogger.warning("Could not del friend objectid: " + e.getMessage()); } } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java index acd698e706..da4a9fc815 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.model.homunculus.Homunculus; import org.l2jmobius.gameserver.model.homunculus.HomunculusTemplate; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.homunculus.ExHomunculusSummonResult; import org.l2jmobius.gameserver.network.serverpackets.homunculus.ExShowHomunculusBirthInfo; @@ -210,7 +211,7 @@ public class RequestExHomunculusSummon implements IClientIncomingPacket final HomunculusTemplate template = HomunculusData.getInstance().getTemplate(homunculusId); if (template == null) { - LOGGER.warning("Counld not find Homunculus template " + homunculusId + "."); + PacketLogger.warning("Counld not find Homunculus template " + homunculusId + "."); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExSummonHomunculusCouponResult.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExSummonHomunculusCouponResult.java index ea4a53ecd3..dfec52bbb8 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExSummonHomunculusCouponResult.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExSummonHomunculusCouponResult.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.homunculus.Homunculus; import org.l2jmobius.gameserver.model.homunculus.HomunculusTemplate; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.homunculus.ExShowHomunculusBirthInfo; import org.l2jmobius.gameserver.network.serverpackets.homunculus.ExShowHomunculusList; @@ -216,7 +217,7 @@ public class RequestExSummonHomunculusCouponResult implements IClientIncomingPac final HomunculusTemplate template = HomunculusData.getInstance().getTemplate(homunculusId); if (template == null) { - LOGGER.warning("Could not find Homunculus template " + homunculusId + "."); + PacketLogger.warning("Could not find Homunculus template " + homunculusId + "."); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index 7afab50b4f..5f884b565a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.mentoring; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMenteeAdd; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -93,7 +93,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, e.getMessage(), e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index 41700d0f61..39121a166d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; @@ -56,7 +57,7 @@ public class RequestExPledgeMissionReward implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { - LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); + PacketLogger.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java index ee8910d06e..a53878b794 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductList; @@ -60,7 +61,7 @@ public class RequestBRProductList implements IClientIncomingPacket } default: { - LOGGER.warning(player + " send unhandled product list type: " + _type); + PacketLogger.warning(player + " send unhandled product list type: " + _type); break; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java index 10c89bed0e..f29aabd0cb 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java @@ -51,7 +51,7 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket } else { - // LOGGER.warning("Could not find spawn info for boss " + bossId + "."); + // PacketLogger.warning("Could not find spawn info for boss " + bossId + "."); } } else diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java index e83bf335a7..a828073bb9 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.SayuneRequest; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.type.SayuneZone; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; @@ -72,7 +73,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (zone.getMapId() == -1) { player.sendMessage("That zone is not supported yet!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); return; } @@ -80,7 +81,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (map == null) { player.sendMessage("This zone is not handled yet!!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java index f1ede4ef0a..41648f184f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Shuttle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -60,7 +61,7 @@ public class RequestShuttleGetOn implements IClientIncomingPacket player.getInVehiclePosition().setXYZ(_x, _y, _z); break; } - LOGGER.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); + PacketLogger.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); } } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleport.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleport.java index b783c9696c..2e5317f897 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleport.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleport.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.holders.TeleportListHolder; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; @@ -55,7 +56,7 @@ public class ExRequestTeleport implements IClientIncomingPacket final TeleportListHolder teleport = TeleportListData.getInstance().getTeleport(_teleportId); if (teleport == null) { - LOGGER.warning("No registered teleport location for id: " + _teleportId); + PacketLogger.warning("No registered teleport location for id: " + _teleportId); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoritesAddDel.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoritesAddDel.java index a5b01e87b5..50f4b4d87d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoritesAddDel.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoritesAddDel.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.data.xml.TeleportListData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -53,7 +54,7 @@ public class ExRequestTeleportFavoritesAddDel implements IClientIncomingPacket if (TeleportListData.getInstance().getTeleport(_teleportId) == null) { - LOGGER.warning("No registered teleport location for id: " + _teleportId); + PacketLogger.warning("No registered teleport location for id: " + _teleportId); return; } @@ -62,7 +63,7 @@ public class ExRequestTeleportFavoritesAddDel implements IClientIncomingPacket { if (TeleportListData.getInstance().getTeleport(_teleportId) == null) { - LOGGER.warning("No registered teleport location for id: " + _teleportId); + PacketLogger.warning("No registered teleport location for id: " + _teleportId); } else { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 33eeff5060..1b8ddb2042 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -16,11 +16,10 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Level; - import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.util.Util; /** @@ -75,7 +74,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { if (html.length() > 17200) { - LOGGER.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable()); + PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } @@ -94,7 +93,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket if (content == null) { setHtml("My Text is missing:
" + path + ""); - LOGGER.warning("missing html page " + path); + PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index e6b4b8b604..57ed88ac29 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; /** @@ -46,7 +47,7 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index d94dbf4403..75f6596194 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Migi, DS @@ -44,7 +45,7 @@ public class ExReplySentPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index b0f3738683..15d011befc 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author KenM @@ -54,7 +55,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); + PacketLogger.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); packet.writeS(""); } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index d588f1c7cf..b5c8628b50 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IOutgoingPacket; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; @@ -28,8 +26,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; */ public interface IClientOutgoingPacket extends IOutgoingPacket { - Logger LOGGER = Logger.getLogger(IClientOutgoingPacket.class.getName()); - int[] PAPERDOLL_ORDER = new int[] { Inventory.PAPERDOLL_UNDER, diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 29a4f31530..79d478aff9 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan.SubPledge; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author -Wooden- @@ -56,7 +57,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket } else if (_clan.getClanMember(LeaderId) == null) { - LOGGER.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); + PacketLogger.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); return ""; } else diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index a95e7ab97c..d9c2621c84 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.RecipeData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.RecipeHolder; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class RecipeItemMakeInfo implements IClientOutgoingPacket { @@ -77,7 +78,8 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeQ(_offeringMaximumAdena); // Adena worth of items for maximum offering. return true; } - LOGGER.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); + + PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 432ff8ad7f..0a3fe46cb7 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Shows the Siege Info
@@ -78,7 +79,7 @@ public class SiegeInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Null owner for castle: " + _castle.getName()); + PacketLogger.warning("Null owner for castle: " + _castle.getName()); } } else diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 44f290e92f..746b2da3f7 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; @@ -157,7 +158,7 @@ public class SystemMessage implements IClientOutgoingPacket // Mobius: With additional on-screen damage param (popup), length is increased. if (param.getType() != TYPE_POPUP_ID) { - LOGGER.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); + PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } @@ -414,7 +415,7 @@ public class SystemMessage implements IClientOutgoingPacket { if (param == null) { - LOGGER.warning("Found null parameter for SystemMessageId " + _smId); + PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 37150ec357..7af1cd273c 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -24,6 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class WareHouseWithdrawalList extends AbstractItemPacket { @@ -56,7 +57,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket _invSize = player.getInventory().getSize(); if (_player.getActiveWarehouse() == null) { - LOGGER.warning("error while sending withdraw request to: " + _player.getName()); + PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java index a63178770a..d1896f32a7 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.instancemanager.RankManager; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; /** @@ -134,7 +135,7 @@ public class ExOlympiadHeroAndLegendInfo implements IClientOutgoingPacket } catch (SQLException e) { - LOGGER.warning("Hero and Legend Info: Couldnt load data: " + e.getMessage()); + PacketLogger.warning("Hero and Legend Info: Couldnt load data: " + e.getMessage()); } } return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java index 710d957175..b7395dee4e 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; /** @@ -96,7 +97,7 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket } catch (SQLException e) { - LOGGER.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); + PacketLogger.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); } int previousPlace = 0; @@ -125,7 +126,7 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket } catch (SQLException e) { - LOGGER.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); + PacketLogger.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); } int heroCount = 0; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/PacketLogger.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/PacketLogger.java new file mode 100644 index 0000000000..5b5a083a99 --- /dev/null +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/PacketLogger.java @@ -0,0 +1,42 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.network; + +import java.util.logging.Logger; + +/** + * @author Mobius + */ +public class PacketLogger +{ + private static final Logger LOGGER = Logger.getLogger(PacketLogger.class.getName()); + + public static synchronized void warning(String message) + { + LOGGER.warning(message); + } + + public static synchronized void info(String message) + { + LOGGER.info(message); + } + + public static synchronized void finer(String message) + { + LOGGER.finer(message); + } +} diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index f2e88e2f87..69dcdf5a0a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -126,7 +127,7 @@ public class Action implements IClientIncomingPacket default: { // Invalid action detected (probably client cheating), LOGGER this - LOGGER.warning("Character: " + player.getName() + " requested invalid action: " + _actionId); + PacketLogger.warning("Character: " + player.getName() + " requested invalid action: " + _actionId); client.sendPacket(ActionFailed.STATIC_PACKET); break; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index 12ea96ae1e..98aadbe9b1 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; @@ -54,7 +55,7 @@ public class AddTradeItem implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) // Trade null { - LOGGER.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); + PacketLogger.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); player.getClient().sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -65,7 +66,7 @@ public class AddTradeItem implements IClientIncomingPacket // Trade partner not found, cancel trade if (trade.getPartner() != null) { - LOGGER.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); + PacketLogger.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); } player.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE); @@ -94,7 +95,7 @@ public class AddTradeItem implements IClientIncomingPacket // Java Emulator Security if ((player.getInventory().getItemByObjectId(_objectId) == null) || (_count <= 0)) { - LOGGER.info("Character:" + player.getName() + " requested invalid trade object"); + PacketLogger.info("Character:" + player.getName() + " requested invalid trade object."); player.getClient().sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 6f07eab10f..a92da53ec9 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -41,6 +41,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; import org.l2jmobius.gameserver.network.serverpackets.CharCreateOk; import org.l2jmobius.gameserver.network.serverpackets.CharSelectInfo; @@ -159,7 +160,7 @@ public class CharacterCreate implements IClientIncomingPacket } catch (PatternSyntaxException e) // case of illegal pattern { - LOGGER.warning("Character name pattern of config is wrong!"); + PacketLogger.warning("Character name pattern of config is wrong!"); pattern = Pattern.compile(".*"); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java index c76ffd69f6..f2add3b5fe 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java @@ -16,10 +16,9 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Level; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteFail; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteOk; import org.l2jmobius.gameserver.network.serverpackets.CharSelectInfo; @@ -75,7 +74,7 @@ public class CharacterDelete implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Error:", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } final CharSelectInfo cl = new CharSelectInfo(client.getAccountName(), client.getSessionId().playOkID1, 0); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelected.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelected.java index 17abe74754..ffe922f908 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelected.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelected.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.CharSelected; @@ -67,7 +68,7 @@ public class CharacterSelected implements IClientIncomingPacket final Player cha = client.loadCharFromDisk(_charSlot); if (cha == null) { - LOGGER.warning("Character could not be loaded (slot:" + _charSlot + ")"); + PacketLogger.warning("Character could not be loaded (slot:" + _charSlot + ")"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -86,7 +87,7 @@ public class CharacterSelected implements IClientIncomingPacket } catch (Exception e) { - LOGGER.warning(e.toString()); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } finally { 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 a2408a970b..a7a52a49dd 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 @@ -63,6 +63,7 @@ import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ClientSetTime; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; @@ -110,7 +111,7 @@ public class EnterWorld implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.warning("EnterWorld failed! player is null..."); + PacketLogger.warning("EnterWorld failed! player is null..."); client.closeNow(); return; } @@ -124,7 +125,7 @@ public class EnterWorld implements IClientIncomingPacket // FloodProtector.getInstance().registerNewPlayer(player.getObjectId()); if (!player.isGM() && !player.isDonator() && Config.CHECK_NAME_ON_LOGIN && ((player.getName().length() < 3) || (player.getName().length() > 16) || !Util.isAlphaNumeric(player.getName()) || !isValidName(player.getName()))) { - LOGGER.warning("Charname: " + player.getName() + " is invalid. EnterWorld failed."); + PacketLogger.warning("Charname: " + player.getName() + " is invalid. EnterWorld failed."); client.closeNow(); return; } @@ -221,8 +222,8 @@ public class EnterWorld implements IClientIncomingPacket // Punishment e LOGGER in audit Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " has Overenchanted item! Kicked! ", Config.DEFAULT_PUNISH); // Logger in console - LOGGER.info("#### ATTENTION ####"); - LOGGER.info(i + " item has been removed from " + player); + PacketLogger.info("#### ATTENTION ####"); + PacketLogger.info(i + " item has been removed from " + player); } } } @@ -419,7 +420,7 @@ public class EnterWorld implements IClientIncomingPacket } else { - LOGGER.info("Attention: Remote ClassMaster is Enabled, but not inserted into DataBase. Remember to install 31288 Custom_Npc..."); + PacketLogger.info("Attention: Remote ClassMaster is Enabled, but not inserted into DataBase. Remember to install 31288 Custom_Npc..."); } } @@ -466,7 +467,7 @@ public class EnterWorld implements IClientIncomingPacket } catch (PatternSyntaxException e) // case of illegal pattern { - LOGGER.warning("Character name pattern of config is wrong!"); + PacketLogger.warning("Character name pattern of config is wrong!"); pattern = Pattern.compile(".*"); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java index eddff9f891..62e69acd86 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.gameserver.network.GameClient; @@ -27,5 +25,4 @@ import org.l2jmobius.gameserver.network.GameClient; */ public interface IClientIncomingPacket extends IIncomingPacket { - Logger LOGGER = Logger.getLogger(IClientIncomingPacket.class.getName()); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 811909c9f8..d7f19dbc8e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.multisell.MultiSellEntry; import org.l2jmobius.gameserver.model.multisell.MultiSellIngredient; import org.l2jmobius.gameserver.model.multisell.MultiSellListContainer; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ItemList; @@ -257,13 +258,13 @@ public class MultiSellChoose implements IClientIncomingPacket // this is a cheat, transaction will be aborted and if any items already tanken will not be returned back to inventory! if (itemToTake == null) { - LOGGER.warning("Character: " + player.getName() + " is trying to cheat in multisell, merchatnt id:" + (merchant != null ? merchant.getNpcId() : 0)); + PacketLogger.warning("Character: " + player.getName() + " is trying to cheat in multisell, merchatnt id:" + (merchant != null ? merchant.getNpcId() : 0)); return; } if (itemToTake.isWear()) { - LOGGER.warning("Character: " + player.getName() + " is trying to cheat in multisell with weared item"); + PacketLogger.warning("Character: " + player.getName() + " is trying to cheat in multisell with weared item"); return; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index 151f99de2c..3a46e02371 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.KeyPacket; public class ProtocolVersion implements IClientIncomingPacket @@ -42,8 +43,8 @@ public class ProtocolVersion implements IClientIncomingPacket } else if ((_version < Config.MIN_PROTOCOL_REVISION) || (_version > Config.MAX_PROTOCOL_REVISION)) { - LOGGER.info("Client: " + client + " -> Protocol Revision: " + _version + " is invalid. Minimum is " + Config.MIN_PROTOCOL_REVISION + " and Maximum is " + Config.MAX_PROTOCOL_REVISION + " are supported. Closing connection."); - LOGGER.warning("Wrong Protocol Version " + _version); + PacketLogger.info("Client: " + client + " -> Protocol Revision: " + _version + " is invalid. Minimum is " + Config.MIN_PROTOCOL_REVISION + " and Maximum is " + Config.MAX_PROTOCOL_REVISION + " are supported. Closing connection."); + PacketLogger.warning("Wrong Protocol Version " + _version); client.close(new KeyPacket(client.enableCrypt(), 0)); } else diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index 91df7d737b..7463927eb9 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -33,12 +33,13 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.instance.SiegeSummon; import org.l2jmobius.gameserver.model.actor.instance.StaticObject; -import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ChairSit; @@ -494,14 +495,14 @@ public class RequestActionUse implements IClientIncomingPacket } case 96: // Quit Party Command Channel { - LOGGER.info("98 Accessed"); + PacketLogger.info("98 Accessed"); break; } case 97: // Request Party Command Channel Info { // if (!PartyCommandManager.getInstance().isPlayerInChannel(activeChar)) // return; - LOGGER.info("97 Accessed"); + PacketLogger.info("97 Accessed"); // PartyCommandManager.getInstance().getActiveChannelInfo(activeChar); break; } @@ -650,7 +651,7 @@ public class RequestActionUse implements IClientIncomingPacket } default: { - LOGGER.warning(player.getName() + ": unhandled action type " + _actionId); + PacketLogger.warning(player.getName() + ": unhandled action type " + _actionId); } } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerFriendInvite.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerFriendInvite.java index 44cbeba747..49b35d57cf 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerFriendInvite.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerFriendInvite.java @@ -23,6 +23,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.FriendList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -81,7 +82,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket } catch (Exception e) { - LOGGER.warning("could not add friend objectid: " + e); + PacketLogger.warning("Could not add friend objectid: " + e); } } else 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 77420b22cd..e38f8552eb 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 @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Folk; import org.l2jmobius.gameserver.model.actor.instance.VillageMaster; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExStorageMaxCount; import org.l2jmobius.gameserver.network.serverpackets.PledgeSkillList; @@ -270,7 +271,7 @@ public class RequestAquireSkill implements IClientIncomingPacket } else { - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill - unk1:" + _skillType); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill - unk1:" + _skillType); return; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java index 28f42e9ef6..50f7678aa5 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; public class RequestBlock implements IClientIncomingPacket @@ -101,7 +102,7 @@ public class RequestBlock implements IClientIncomingPacket } default: { - LOGGER.info("Unknown 0x0a block type: " + _type); + PacketLogger.info("Unknown 0x0a block type: " + _type); } } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index 226cf9c155..8816ee7b87 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.actor.instance.MercManager; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ItemList; @@ -263,7 +264,7 @@ public class RequestBuyItem implements IClientIncomingPacket if (price < 0) { - LOGGER.warning("ERROR, no price found .. wrong buylist ??"); + PacketLogger.warning("ERROR, no price found .. wrong buylist ??"); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 7c2e1a76e8..a101de36c8 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.instance.ClassMaster; import org.l2jmobius.gameserver.model.actor.instance.SymbolMaker; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.GMAudit; @@ -86,7 +87,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (ach == null) { player.sendMessage("The command " + command + " does not exists!"); - LOGGER.warning("No handler registered for admin command '" + command + "'"); + PacketLogger.warning("No handler registered for admin command '" + command + "'"); return; } @@ -241,7 +242,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (Exception e) { - LOGGER.warning("Bad RequestBypassToServer: " + e); + PacketLogger.warning("Bad RequestBypassToServer: " + e.getMessage()); } } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 451f2edc9a..31ae2e3da8 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -53,7 +54,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.warning("RequestCrystalizeItem: activeChar was null"); + PacketLogger.warning("RequestCrystalizeItem: activeChar was null."); return; } @@ -115,7 +116,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket if (!itemToRemove.getItem().isCrystallizable() || (itemToRemove.getItem().getCrystalCount() <= 0) || (itemToRemove.getItem().getCrystalType() == ItemTemplate.CRYSTAL_NONE)) { - LOGGER.warning("" + player.getObjectId() + " tried to crystallize " + itemToRemove.getItem().getItemId()); + PacketLogger.warning(player.getObjectId() + " tried to crystallize " + itemToRemove.getItem().getItemId()); return; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 72bfdb6c83..9d2e6bd449 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.data.sql.PetDataTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; @@ -138,7 +139,7 @@ public class RequestDestroyItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.warning("could not delete pet objectid: " + e); + PacketLogger.warning("Could not delete pet objectid: " + e); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 22cd995a9d..c2c6caf799 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -202,7 +203,7 @@ public class RequestDropItem implements IClientIncomingPacket if ((dropedItem != null) && (dropedItem.getItemId() == 57) && (dropedItem.getCount() >= 1000000) && (Config.RATE_DROP_ADENA <= 200)) { final String msg = "Character (" + player.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")"; - LOGGER.warning(msg); + PacketLogger.warning(msg); AdminData.broadcastMessageToGMs(msg); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestFriendDel.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestFriendDel.java index a497a00067..bf4eccba8c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestFriendDel.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestFriendDel.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.FriendList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -81,7 +82,7 @@ public class RequestFriendDel implements IClientIncomingPacket } catch (Exception e) { - LOGGER.warning("could not delete friend objectid: " + e); + PacketLogger.warning("Could not delete friend objectId: " + e.getMessage()); } } } \ No newline at end of file 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 596526e19d..5e03f50d47 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 @@ -21,6 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ItemList; @@ -85,7 +86,7 @@ public class RequestGetItemFromPet implements IClientIncomingPacket if (pet.transferItem("Transfer", _objectId, _amount, player.getInventory(), player, pet) == null) { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } player.sendPacket(new ItemList(player, true)); } 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 15a0221fdf..cb9b380e1d 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 @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.IllegalPlayerAction; import org.l2jmobius.gameserver.util.Util; @@ -103,7 +104,7 @@ public class RequestGiveItemToPet implements IClientIncomingPacket if (player.transferItem("Transfer", _objectId, _amount, pet.getInventory(), pet) == null) { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java index 917459b77b..4fdf99cb54 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; /** @@ -46,7 +47,7 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.contains("..") || !_link.contains(".htm")) { - LOGGER.warning("[RequestLinkHtml] hack? link contains prohibited characters: '" + _link + "', skipped"); + PacketLogger.warning("[RequestLinkHtml] hack? link contains prohibited characters: '" + _link + "', skipped"); return; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 353c7def00..9fbc7ec30a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; /** @@ -97,7 +98,7 @@ public class RequestMagicSkillUse implements IClientIncomingPacket else { player.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("No skill found with id " + _magicId + " and level " + level + " !!"); + PacketLogger.warning("No skill found with id " + _magicId + " and level " + level + " !!"); } } } \ No newline at end of file diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 35fcdfd212..4cc2a180a3 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListDelete; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -69,7 +70,7 @@ public class RequestOustPledgeMember implements IClientIncomingPacket final ClanMember member = clan.getClanMember(_target); if (member == null) { - LOGGER.info("Target (" + _target + ") is not member of the clan"); + PacketLogger.info("Target (" + _target + ") is not member of the clan"); return; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java index 459a95bf25..5ac4d49561 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) S @@ -37,6 +38,6 @@ public class RequestPCCafeCouponUse implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestPCCafeCouponUse: S: " + _str); + PacketLogger.info("C5: RequestPCCafeCouponUse: S: " + _str); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index b89d919e6e..a13411d348 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -149,7 +150,7 @@ public class RequestPackageSend implements IClientIncomingPacket // Check if item is null if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); i.id = 0; i.count = 0; continue; @@ -206,7 +207,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item oldItem = player.getInventory().getItemByObjectId(objectId); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); continue; } @@ -219,7 +220,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem("Warehouse", objectId, count, warehouse, player, player.getLastFolkNPC()); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java index 1852c52fff..8f427513b2 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java @@ -64,7 +64,7 @@ public class RequestPartyMatchList implements IClientIncomingPacket final PartyMatchRoom room = PartyMatchRoomList.getInstance().getRoom(_roomid); if (room != null) { - LOGGER.info("PartyMatchRoom #" + room.getId() + " changed by " + player.getName()); + // PacketLogger.info("PartyMatchRoom #" + room.getId() + " changed by " + player.getName()); room.setMaxMembers(_membersmax); room.setMinLevel(_minLevel); room.setMaxLevel(_maxLevel); @@ -88,7 +88,7 @@ public class RequestPartyMatchList implements IClientIncomingPacket final int maxId = PartyMatchRoomList.getInstance().getMaxId(); final PartyMatchRoom room = new PartyMatchRoom(maxId, _roomtitle, _loot, _minLevel, _maxLevel, _membersmax, player); - LOGGER.info("PartyMatchRoom #" + maxId + " created by " + player.getName()); + // PacketLogger.info("PartyMatchRoom #" + maxId + " created by " + player.getName()); // Remove from waiting list, and add to current room PartyMatchWaitingList.getInstance().removePlayer(player); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index b1c6096b49..507369d856 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetInfo; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; @@ -183,7 +184,7 @@ public class RequestPetUseItem implements IClientIncomingPacket final IItemHandler handler = ItemHandler.getInstance().getItemHandler(item.getItemId()); if (handler == null) { - LOGGER.warning("no itemhandler registered for itemId:" + item.getItemId()); + PacketLogger.warning("No itemhandler registered for itemId: " + item.getItemId()); } else { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java index 12c6011ee2..0f25e0eec1 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java @@ -44,8 +44,8 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket @Override public void run(GameClient client) { - // LOGGER.info("C5: RequestPledgeMemberInfo d:"+_unk1); - // LOGGER.info("C5: RequestPledgeMemberInfo S:"+_player); + // PacketLogger.info("C5: RequestPledgeMemberInfo d:"+_unk1); + // PacketLogger.info("C5: RequestPledgeMemberInfo S:"+_player); final Player player = client.getPlayer(); if (player == null) { 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 d57f65b7f9..ede953f93f 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 @@ -21,11 +21,12 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.ItemRequest; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.TradeList.TradeItem; -import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; +import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -189,7 +190,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); // Punishment e LOGGER in audit Util.handleIllegalPlayerAction(storePlayer, "PrivateStore buy has failed due to invalid list or request. Player: " + player.getName(), Config.DEFAULT_PUNISH); - LOGGER.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); 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 0c70e535fe..cd4a96074b 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 @@ -21,6 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.PrivateStoreManageListBuy; @@ -47,7 +48,7 @@ public class RequestPrivateStoreManageBuy implements IClientIncomingPacket if (!player.isSpawned() || player.isLocked()) { Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " try exploit at login with privatestore!", Config.DEFAULT_PUNISH); - LOGGER.warning("Player " + player.getName() + " try exploit at login with privatestore!"); + PacketLogger.warning("Player " + player.getName() + " 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 d268829492..8505c47ce7 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 @@ -21,6 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.PrivateStoreManageListSell; @@ -47,7 +48,7 @@ public class RequestPrivateStoreManageSell implements IClientIncomingPacket if (!player.isSpawned() || player.isLocked()) { Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " try exploit at login with privatestore!", Config.DEFAULT_PUNISH); - LOGGER.warning("Player " + player.getName() + " try exploit at login with privatestore!"); + PacketLogger.warning("Player " + player.getName() + " 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 71c02271b8..9db17b4b27 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 @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Util; @@ -157,7 +158,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket { player.sendPacket(ActionFailed.STATIC_PACKET); Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " provided invalid list or request! ", Config.DEFAULT_PUNISH); - LOGGER.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); 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 dccad11e1a..a1bee2d57b 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 @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.sevensigns.SevenSignsFestival; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.CharSelectInfo; @@ -67,7 +68,7 @@ public class RequestRestart implements IClientIncomingPacket // Check if player are changing class if (player.isLocked()) { - LOGGER.warning("Player " + player.getName() + " tried to restart during class change."); + PacketLogger.warning("Player " + player.getName() + " 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/RequestRestartPoint.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index f2e86ac351..db1cef34a1 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.Revive; import org.l2jmobius.gameserver.util.IllegalPlayerAction; import org.l2jmobius.gameserver.util.Util; @@ -69,7 +70,7 @@ public class RequestRestartPoint implements IClientIncomingPacket } else if (!player.isAlikeDead()) { - LOGGER.warning("Living player [" + player.getName() + "] called RestartPointPacket! Ban this player!"); + PacketLogger.warning("Living player [" + player.getName() + "] called RestartPointPacket! Ban this player!"); return; } @@ -254,7 +255,7 @@ public class RequestRestartPoint implements IClientIncomingPacket } catch (Throwable e) { - LOGGER.warning(e.toString()); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPersonally.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPersonally.java index f9001c166d..9b4dcaaaa4 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPersonally.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPersonally.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -45,7 +46,7 @@ public class RequestSurrenderPersonally implements IClientIncomingPacket return; } - LOGGER.info("RequestSurrenderPersonally by " + player.getName() + " with " + _pledgeName); + PacketLogger.info("RequestSurrenderPersonally by " + player.getName() + " with " + _pledgeName); final Clan playerClan = player.getClan(); final Clan clan = ClanTable.getInstance().getClanByName(_pledgeName); if (playerClan == null) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java index 8273025f1b..d32d66bb5b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -59,7 +60,7 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket return; } - LOGGER.info("RequestSurrenderPledgeWar by " + player.getClan().getName() + " with " + _pledgeName); + PacketLogger.info("RequestSurrenderPledgeWar by " + player.getClan().getName() + " with " + _pledgeName); if (!playerclan.isAtWarWith(clan.getClanId())) { player.sendMessage("You aren't at war with this clan."); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestWearItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestWearItem.java index 132e0e5d2f..3ebc902864 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestWearItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestWearItem.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -69,7 +70,7 @@ public class RequestWearItem implements IClientIncomingPacket } catch (Throwable e) { - LOGGER.warning(e.getMessage()); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } @@ -148,7 +149,7 @@ public class RequestWearItem implements IClientIncomingPacket final Merchant merchant = (target != null) && (target instanceof Merchant) ? (Merchant) target : null; if (merchant == null) { - LOGGER.warning("Null merchant!"); + PacketLogger.warning(getClass().getSimpleName() + ": Null merchant!"); 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 1400232f7a..73f8acb436 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 @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player.PunishLevel; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -101,14 +102,14 @@ public class Say2 implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.warning("[Say2.java] Active Character is null."); + PacketLogger.warning("[Say2.java] Active Character is null."); return; } ChatType chatType = ChatType.findByClientId(_type); if (chatType == null) { - LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); + PacketLogger.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); return; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java index 37f85ee5a1..65ac4a7789 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.handler.AdminCommandHandler; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.util.GMAudit; /** @@ -56,7 +57,7 @@ public class SendBypassBuildCmd implements IClientIncomingPacket if (handler == null) { player.sendMessage("The command " + _command + " does not exist!"); - LOGGER.warning("No handler registered for admin command '" + _command + "'."); + PacketLogger.warning("No handler registered for admin command '" + _command + "'."); return; } @@ -64,7 +65,7 @@ public class SendBypassBuildCmd implements IClientIncomingPacket if (!AdminData.getInstance().hasAccess(_command, player.getAccessLevel())) { player.sendMessage("You don't have the access right to use this command!"); - LOGGER.warning("Character " + player.getName() + " tried to use admin command " + _command + ", but doesn't have access to it!"); + PacketLogger.warning("Character " + player.getName() + " tried to use admin command " + _command + ", but doesn't have access to it!"); return; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 31e1a53f7b..3c91d718c3 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.EnchantResult; @@ -165,7 +166,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item item = player.checkItemManipulation(objectId, count, "deposit"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); _items[(i * 2) + 0] = 0; _items[(i * 2) + 1] = 0; continue; @@ -222,7 +223,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item oldItem = player.getInventory().getItemByObjectId(objectId); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); continue; } @@ -235,7 +236,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem("Warehouse", objectId, count, warehouse, player, player.getLastFolkNPC()); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index a99759e0b6..736804403b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.EnchantResult; @@ -189,7 +190,7 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket final Item newItem = warehouse.transferItem("Warehouse", objectId, count, player.getInventory(), player, player.getLastFolkNPC()); if (newItem == null) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName()); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName()); continue; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectInfo.java index e1fa465c60..2e49c91469 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectInfo.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @version $Revision: 1.8.2.4.2.6 $ $Date: 2005/04/06 16:13:46 $ @@ -222,7 +223,7 @@ public class CharSelectInfo implements IClientOutgoingPacket } catch (Exception e) { - LOGGER.warning(e.toString()); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } return characterList; @@ -248,7 +249,7 @@ public class CharSelectInfo implements IClientOutgoingPacket } catch (Exception e) { - LOGGER.warning(e.toString()); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index 982959201e..35ff495b46 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IOutgoingPacket; import org.l2jmobius.gameserver.model.actor.Player; @@ -26,8 +24,6 @@ import org.l2jmobius.gameserver.model.actor.Player; */ public interface IClientOutgoingPacket extends IOutgoingPacket { - Logger LOGGER = Logger.getLogger(IClientOutgoingPacket.class.getName()); - default void runImpl(Player player) { } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java index d0051da620..0a96399834 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java @@ -21,6 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -181,14 +182,14 @@ public class NpcHtmlMessage implements IClientOutgoingPacket { if (text == null) { - LOGGER.warning("Html is null! this will crash the client!"); + PacketLogger.warning("Html is null! This will crash the client!"); _html = ""; return; } if (text.length() > 8192) { - LOGGER.warning("Html is too long! this will crash the client!"); + PacketLogger.warning("Html is too long! This will crash the client!"); _html = "Html was too long,
Try to use DB for this action"; return; } @@ -207,7 +208,7 @@ public class NpcHtmlMessage implements IClientOutgoingPacket if (content == null) { setHtml("My Text is missing:
" + path + ""); - LOGGER.warning("missing html page " + path); + PacketLogger.warning("Missing html page " + path); return false; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index b29b42ab17..e35e864754 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Shows the Siege Info
@@ -90,7 +91,7 @@ public class SiegeInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Null owner for castle: " + _name); + PacketLogger.warning("Null owner for castle: " + _name); } } else diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 777e9bb07f..a6a793cda6 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -22,6 +22,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * 0x42 WarehouseWithdrawalList dh (h dddhh dhhh d) @@ -47,7 +48,7 @@ public class WareHouseWithdrawalList implements IClientOutgoingPacket if (_player.getActiveWarehouse() == null) { // Something went wrong! - LOGGER.warning("error while sending withdraw request to: " + _player.getName()); + PacketLogger.warning("Error while sending withdraw request to: " + _player.getName()); return; } _items = _player.getActiveWarehouse().getItems(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/PacketLogger.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/PacketLogger.java new file mode 100644 index 0000000000..5b5a083a99 --- /dev/null +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/PacketLogger.java @@ -0,0 +1,42 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.network; + +import java.util.logging.Logger; + +/** + * @author Mobius + */ +public class PacketLogger +{ + private static final Logger LOGGER = Logger.getLogger(PacketLogger.class.getName()); + + public static synchronized void warning(String message) + { + LOGGER.warning(message); + } + + public static synchronized void info(String message) + { + LOGGER.info(message); + } + + public static synchronized void finer(String message) + { + LOGGER.finer(message); + } +} diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index f2e88e2f87..69dcdf5a0a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -126,7 +127,7 @@ public class Action implements IClientIncomingPacket default: { // Invalid action detected (probably client cheating), LOGGER this - LOGGER.warning("Character: " + player.getName() + " requested invalid action: " + _actionId); + PacketLogger.warning("Character: " + player.getName() + " requested invalid action: " + _actionId); client.sendPacket(ActionFailed.STATIC_PACKET); break; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index 6717a25fb3..bd2ac80a46 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; @@ -54,7 +55,7 @@ public class AddTradeItem implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) // Trade null { - LOGGER.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); + PacketLogger.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); player.getClient().sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -65,7 +66,7 @@ public class AddTradeItem implements IClientIncomingPacket // Trade partner not found, cancel trade if (trade.getPartner() != null) { - LOGGER.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); + PacketLogger.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); } player.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE); @@ -94,7 +95,7 @@ public class AddTradeItem implements IClientIncomingPacket // Java Emulator Security if ((player.getInventory().getItemByObjectId(_objectId) == null) || (_count <= 0)) { - LOGGER.info("Character:" + player.getName() + " requested invalid trade object"); + PacketLogger.info("Character:" + player.getName() + " requested invalid trade object."); player.getClient().sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 6f07eab10f..a92da53ec9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -41,6 +41,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; import org.l2jmobius.gameserver.network.serverpackets.CharCreateOk; import org.l2jmobius.gameserver.network.serverpackets.CharSelectInfo; @@ -159,7 +160,7 @@ public class CharacterCreate implements IClientIncomingPacket } catch (PatternSyntaxException e) // case of illegal pattern { - LOGGER.warning("Character name pattern of config is wrong!"); + PacketLogger.warning("Character name pattern of config is wrong!"); pattern = Pattern.compile(".*"); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java index c76ffd69f6..f2add3b5fe 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java @@ -16,10 +16,9 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Level; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteFail; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteOk; import org.l2jmobius.gameserver.network.serverpackets.CharSelectInfo; @@ -75,7 +74,7 @@ public class CharacterDelete implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Error:", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } final CharSelectInfo cl = new CharSelectInfo(client.getAccountName(), client.getSessionId().playOkID1, 0); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelected.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelected.java index 17abe74754..ffe922f908 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelected.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterSelected.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.CharSelected; @@ -67,7 +68,7 @@ public class CharacterSelected implements IClientIncomingPacket final Player cha = client.loadCharFromDisk(_charSlot); if (cha == null) { - LOGGER.warning("Character could not be loaded (slot:" + _charSlot + ")"); + PacketLogger.warning("Character could not be loaded (slot:" + _charSlot + ")"); client.sendPacket(ActionFailed.STATIC_PACKET); return; } @@ -86,7 +87,7 @@ public class CharacterSelected implements IClientIncomingPacket } catch (Exception e) { - LOGGER.warning(e.toString()); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } finally { 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 beed4288fc..d4dd26a4d1 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 @@ -64,6 +64,7 @@ import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ClientSetTime; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; @@ -112,7 +113,7 @@ public class EnterWorld implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.warning("EnterWorld failed! player is null..."); + PacketLogger.warning("EnterWorld failed! player is null..."); client.closeNow(); return; } @@ -126,7 +127,7 @@ public class EnterWorld implements IClientIncomingPacket // FloodProtector.getInstance().registerNewPlayer(player.getObjectId()); if (!player.isGM() && !player.isDonator() && Config.CHECK_NAME_ON_LOGIN && ((player.getName().length() < 3) || (player.getName().length() > 16) || !Util.isAlphaNumeric(player.getName()) || !isValidName(player.getName()))) { - LOGGER.warning("Charname: " + player.getName() + " is invalid. EnterWorld failed."); + PacketLogger.warning("Charname: " + player.getName() + " is invalid. EnterWorld failed."); client.closeNow(); return; } @@ -244,8 +245,8 @@ public class EnterWorld implements IClientIncomingPacket // Punishment e LOGGER in audit Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " has Overenchanted item! Kicked! ", Config.DEFAULT_PUNISH); // Logger in console - LOGGER.info("#### ATTENTION ####"); - LOGGER.info(i + " item has been removed from " + player); + PacketLogger.info("#### ATTENTION ####"); + PacketLogger.info(i + " item has been removed from " + player); } } } @@ -444,7 +445,7 @@ public class EnterWorld implements IClientIncomingPacket } else { - LOGGER.info("Attention: Remote ClassMaster is Enabled, but not inserted into DataBase. Remember to install 31288 Custom_Npc..."); + PacketLogger.info("Attention: Remote ClassMaster is Enabled, but not inserted into DataBase. Remember to install 31288 Custom_Npc..."); } } @@ -503,7 +504,7 @@ public class EnterWorld implements IClientIncomingPacket } catch (PatternSyntaxException e) // case of illegal pattern { - LOGGER.warning("Character name pattern of config is wrong!"); + PacketLogger.warning("Character name pattern of config is wrong!"); pattern = Pattern.compile(".*"); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java index eddff9f891..62e69acd86 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.gameserver.network.GameClient; @@ -27,5 +25,4 @@ import org.l2jmobius.gameserver.network.GameClient; */ public interface IClientIncomingPacket extends IIncomingPacket { - Logger LOGGER = Logger.getLogger(IClientIncomingPacket.class.getName()); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 583f99b2d7..d2601f4b27 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.multisell.MultiSellEntry; import org.l2jmobius.gameserver.model.multisell.MultiSellIngredient; import org.l2jmobius.gameserver.model.multisell.MultiSellListContainer; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ItemList; @@ -258,13 +259,13 @@ public class MultiSellChoose implements IClientIncomingPacket // this is a cheat, transaction will be aborted and if any items already tanken will not be returned back to inventory! if (itemToTake == null) { - LOGGER.warning("Character: " + player.getName() + " is trying to cheat in multisell, merchatnt id:" + (merchant != null ? merchant.getNpcId() : 0)); + PacketLogger.warning("Character: " + player.getName() + " is trying to cheat in multisell, merchatnt id:" + (merchant != null ? merchant.getNpcId() : 0)); return; } if (itemToTake.isWear()) { - LOGGER.warning("Character: " + player.getName() + " is trying to cheat in multisell with weared item"); + PacketLogger.warning("Character: " + player.getName() + " is trying to cheat in multisell with weared item"); return; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java index 151f99de2c..3a46e02371 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.KeyPacket; public class ProtocolVersion implements IClientIncomingPacket @@ -42,8 +43,8 @@ public class ProtocolVersion implements IClientIncomingPacket } else if ((_version < Config.MIN_PROTOCOL_REVISION) || (_version > Config.MAX_PROTOCOL_REVISION)) { - LOGGER.info("Client: " + client + " -> Protocol Revision: " + _version + " is invalid. Minimum is " + Config.MIN_PROTOCOL_REVISION + " and Maximum is " + Config.MAX_PROTOCOL_REVISION + " are supported. Closing connection."); - LOGGER.warning("Wrong Protocol Version " + _version); + PacketLogger.info("Client: " + client + " -> Protocol Revision: " + _version + " is invalid. Minimum is " + Config.MIN_PROTOCOL_REVISION + " and Maximum is " + Config.MAX_PROTOCOL_REVISION + " are supported. Closing connection."); + PacketLogger.warning("Wrong Protocol Version " + _version); client.close(new KeyPacket(client.enableCrypt(), 0)); } else diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index 7737e91ffb..dea940e3e0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -33,12 +33,13 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.instance.SiegeSummon; import org.l2jmobius.gameserver.model.actor.instance.StaticObject; -import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ChairSit; @@ -499,14 +500,14 @@ public class RequestActionUse implements IClientIncomingPacket } case 96: // Quit Party Command Channel { - LOGGER.info("98 Accessed"); + PacketLogger.info("98 Accessed"); break; } case 97: // Request Party Command Channel Info { // if (!PartyCommandManager.getInstance().isPlayerInChannel(activeChar)) // return; - LOGGER.info("97 Accessed"); + PacketLogger.info("97 Accessed"); // PartyCommandManager.getInstance().getActiveChannelInfo(activeChar); break; } @@ -655,7 +656,7 @@ public class RequestActionUse implements IClientIncomingPacket } default: { - LOGGER.warning(player.getName() + ": unhandled action type " + _actionId); + PacketLogger.warning(player.getName() + ": unhandled action type " + _actionId); } } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerFriendInvite.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerFriendInvite.java index 44cbeba747..49b35d57cf 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerFriendInvite.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerFriendInvite.java @@ -23,6 +23,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.FriendList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -81,7 +82,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket } catch (Exception e) { - LOGGER.warning("could not add friend objectid: " + e); + PacketLogger.warning("Could not add friend objectid: " + e); } } else 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 77420b22cd..e38f8552eb 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 @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Folk; import org.l2jmobius.gameserver.model.actor.instance.VillageMaster; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExStorageMaxCount; import org.l2jmobius.gameserver.network.serverpackets.PledgeSkillList; @@ -270,7 +271,7 @@ public class RequestAquireSkill implements IClientIncomingPacket } else { - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill - unk1:" + _skillType); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill - unk1:" + _skillType); return; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java index 28f42e9ef6..50f7678aa5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; public class RequestBlock implements IClientIncomingPacket @@ -101,7 +102,7 @@ public class RequestBlock implements IClientIncomingPacket } default: { - LOGGER.info("Unknown 0x0a block type: " + _type); + PacketLogger.info("Unknown 0x0a block type: " + _type); } } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index 226cf9c155..8816ee7b87 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.actor.instance.MercManager; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ItemList; @@ -263,7 +264,7 @@ public class RequestBuyItem implements IClientIncomingPacket if (price < 0) { - LOGGER.warning("ERROR, no price found .. wrong buylist ??"); + PacketLogger.warning("ERROR, no price found .. wrong buylist ??"); player.sendPacket(ActionFailed.STATIC_PACKET); return; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 7c2e1a76e8..a101de36c8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.instance.ClassMaster; import org.l2jmobius.gameserver.model.actor.instance.SymbolMaker; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.GMAudit; @@ -86,7 +87,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (ach == null) { player.sendMessage("The command " + command + " does not exists!"); - LOGGER.warning("No handler registered for admin command '" + command + "'"); + PacketLogger.warning("No handler registered for admin command '" + command + "'"); return; } @@ -241,7 +242,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (Exception e) { - LOGGER.warning("Bad RequestBypassToServer: " + e); + PacketLogger.warning("Bad RequestBypassToServer: " + e.getMessage()); } } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 6a68664c75..57cb924068 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -53,7 +54,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.warning("RequestCrystalizeItem: activeChar was null"); + PacketLogger.warning("RequestCrystalizeItem: activeChar was null."); return; } @@ -115,7 +116,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket if (!itemToRemove.getItem().isCrystallizable() || (itemToRemove.getItem().getCrystalCount() <= 0) || (itemToRemove.getItem().getCrystalType() == ItemTemplate.CRYSTAL_NONE)) { - LOGGER.warning("" + player.getObjectId() + " tried to crystallize " + itemToRemove.getItem().getItemId()); + PacketLogger.warning(player.getObjectId() + " tried to crystallize " + itemToRemove.getItem().getItemId()); return; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 9d49855428..8d3ff22247 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; @@ -144,7 +145,7 @@ public class RequestDestroyItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.warning("could not delete pet objectid: " + e); + PacketLogger.warning("Could not delete pet objectid: " + e); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index fbc14cf944..4158e284f2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -221,7 +222,7 @@ public class RequestDropItem implements IClientIncomingPacket if ((dropedItem != null) && (dropedItem.getItemId() == 57) && (dropedItem.getCount() >= 1000000) && (Config.RATE_DROP_ADENA <= 200)) { final String msg = "Character (" + player.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")"; - LOGGER.warning(msg); + PacketLogger.warning(msg); AdminData.broadcastMessageToGMs(msg); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestFriendDel.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestFriendDel.java index a497a00067..bf4eccba8c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestFriendDel.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestFriendDel.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.FriendList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -81,7 +82,7 @@ public class RequestFriendDel implements IClientIncomingPacket } catch (Exception e) { - LOGGER.warning("could not delete friend objectid: " + e); + PacketLogger.warning("Could not delete friend objectId: " + e.getMessage()); } } } \ No newline at end of file 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 596526e19d..5e03f50d47 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 @@ -21,6 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ItemList; @@ -85,7 +86,7 @@ public class RequestGetItemFromPet implements IClientIncomingPacket if (pet.transferItem("Transfer", _objectId, _amount, player.getInventory(), player, pet) == null) { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } player.sendPacket(new ItemList(player, true)); } 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 09e603344e..ac063a6952 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 @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.IllegalPlayerAction; import org.l2jmobius.gameserver.util.Util; @@ -108,7 +109,7 @@ public class RequestGiveItemToPet implements IClientIncomingPacket if (player.transferItem("Transfer", _objectId, _amount, pet.getInventory(), pet) == null) { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java index 917459b77b..4fdf99cb54 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; /** @@ -46,7 +47,7 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.contains("..") || !_link.contains(".htm")) { - LOGGER.warning("[RequestLinkHtml] hack? link contains prohibited characters: '" + _link + "', skipped"); + PacketLogger.warning("[RequestLinkHtml] hack? link contains prohibited characters: '" + _link + "', skipped"); return; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 353c7def00..9fbc7ec30a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; /** @@ -97,7 +98,7 @@ public class RequestMagicSkillUse implements IClientIncomingPacket else { player.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("No skill found with id " + _magicId + " and level " + level + " !!"); + PacketLogger.warning("No skill found with id " + _magicId + " and level " + level + " !!"); } } } \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 35fcdfd212..4cc2a180a3 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListDelete; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -69,7 +70,7 @@ public class RequestOustPledgeMember implements IClientIncomingPacket final ClanMember member = clan.getClanMember(_target); if (member == null) { - LOGGER.info("Target (" + _target + ") is not member of the clan"); + PacketLogger.info("Target (" + _target + ") is not member of the clan"); return; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java index 459a95bf25..5ac4d49561 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) S @@ -37,6 +38,6 @@ public class RequestPCCafeCouponUse implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestPCCafeCouponUse: S: " + _str); + PacketLogger.info("C5: RequestPCCafeCouponUse: S: " + _str); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index be4084948c..b3a32975b0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -149,7 +150,7 @@ public class RequestPackageSend implements IClientIncomingPacket // Check if item is null if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); i.id = 0; i.count = 0; continue; @@ -158,7 +159,7 @@ public class RequestPackageSend implements IClientIncomingPacket // Fix exploit for trade Augmented weapon with freight if (item.isAugmented()) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (item is augmented)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (item is augmented)"); return; } @@ -213,7 +214,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item oldItem = player.getInventory().getItemByObjectId(objectId); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); continue; } @@ -226,7 +227,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem("Warehouse", objectId, count, warehouse, player, player.getLastFolkNPC()); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java index 1852c52fff..8f427513b2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java @@ -64,7 +64,7 @@ public class RequestPartyMatchList implements IClientIncomingPacket final PartyMatchRoom room = PartyMatchRoomList.getInstance().getRoom(_roomid); if (room != null) { - LOGGER.info("PartyMatchRoom #" + room.getId() + " changed by " + player.getName()); + // PacketLogger.info("PartyMatchRoom #" + room.getId() + " changed by " + player.getName()); room.setMaxMembers(_membersmax); room.setMinLevel(_minLevel); room.setMaxLevel(_maxLevel); @@ -88,7 +88,7 @@ public class RequestPartyMatchList implements IClientIncomingPacket final int maxId = PartyMatchRoomList.getInstance().getMaxId(); final PartyMatchRoom room = new PartyMatchRoom(maxId, _roomtitle, _loot, _minLevel, _maxLevel, _membersmax, player); - LOGGER.info("PartyMatchRoom #" + maxId + " created by " + player.getName()); + // PacketLogger.info("PartyMatchRoom #" + maxId + " created by " + player.getName()); // Remove from waiting list, and add to current room PartyMatchWaitingList.getInstance().removePlayer(player); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index b1c6096b49..507369d856 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetInfo; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; @@ -183,7 +184,7 @@ public class RequestPetUseItem implements IClientIncomingPacket final IItemHandler handler = ItemHandler.getInstance().getItemHandler(item.getItemId()); if (handler == null) { - LOGGER.warning("no itemhandler registered for itemId:" + item.getItemId()); + PacketLogger.warning("No itemhandler registered for itemId: " + item.getItemId()); } else { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java index 1124539a71..d94b742b6e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java @@ -44,8 +44,8 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket @Override public void run(GameClient client) { - // LOGGER.info("C5: RequestPledgeMemberInfo d:"+_unk1); - // LOGGER.info("C5: RequestPledgeMemberInfo S:"+_player); + // PacketLogger.info("C5: RequestPledgeMemberInfo d:"+_unk1); + // PacketLogger.info("C5: RequestPledgeMemberInfo S:"+_player); final Player player = client.getPlayer(); if (player == null) { 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 d57f65b7f9..ede953f93f 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 @@ -21,11 +21,12 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.ItemRequest; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.TradeList.TradeItem; -import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; +import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -189,7 +190,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); // Punishment e LOGGER in audit Util.handleIllegalPlayerAction(storePlayer, "PrivateStore buy has failed due to invalid list or request. Player: " + player.getName(), Config.DEFAULT_PUNISH); - LOGGER.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); 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 0c70e535fe..cd4a96074b 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 @@ -21,6 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.PrivateStoreManageListBuy; @@ -47,7 +48,7 @@ public class RequestPrivateStoreManageBuy implements IClientIncomingPacket if (!player.isSpawned() || player.isLocked()) { Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " try exploit at login with privatestore!", Config.DEFAULT_PUNISH); - LOGGER.warning("Player " + player.getName() + " try exploit at login with privatestore!"); + PacketLogger.warning("Player " + player.getName() + " 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 d268829492..8505c47ce7 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 @@ -21,6 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.PrivateStoreManageListSell; @@ -47,7 +48,7 @@ public class RequestPrivateStoreManageSell implements IClientIncomingPacket if (!player.isSpawned() || player.isLocked()) { Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " try exploit at login with privatestore!", Config.DEFAULT_PUNISH); - LOGGER.warning("Player " + player.getName() + " try exploit at login with privatestore!"); + PacketLogger.warning("Player " + player.getName() + " 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 71c02271b8..9db17b4b27 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 @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Util; @@ -157,7 +158,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket { player.sendPacket(ActionFailed.STATIC_PACKET); Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " provided invalid list or request! ", Config.DEFAULT_PUNISH); - LOGGER.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); 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 cb9cb1a7b3..ed5649e090 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 @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.sevensigns.SevenSignsFestival; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.CharSelectInfo; @@ -68,7 +69,7 @@ public class RequestRestart implements IClientIncomingPacket // Check if player are changing class if (player.isLocked()) { - LOGGER.warning("Player " + player.getName() + " tried to restart during class change."); + PacketLogger.warning("Player " + player.getName() + " 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/RequestRestartPoint.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index f2e86ac351..db1cef34a1 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.Revive; import org.l2jmobius.gameserver.util.IllegalPlayerAction; import org.l2jmobius.gameserver.util.Util; @@ -69,7 +70,7 @@ public class RequestRestartPoint implements IClientIncomingPacket } else if (!player.isAlikeDead()) { - LOGGER.warning("Living player [" + player.getName() + "] called RestartPointPacket! Ban this player!"); + PacketLogger.warning("Living player [" + player.getName() + "] called RestartPointPacket! Ban this player!"); return; } @@ -254,7 +255,7 @@ public class RequestRestartPoint implements IClientIncomingPacket } catch (Throwable e) { - LOGGER.warning(e.toString()); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPersonally.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPersonally.java index f9001c166d..9b4dcaaaa4 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPersonally.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPersonally.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -45,7 +46,7 @@ public class RequestSurrenderPersonally implements IClientIncomingPacket return; } - LOGGER.info("RequestSurrenderPersonally by " + player.getName() + " with " + _pledgeName); + PacketLogger.info("RequestSurrenderPersonally by " + player.getName() + " with " + _pledgeName); final Clan playerClan = player.getClan(); final Clan clan = ClanTable.getInstance().getClanByName(_pledgeName); if (playerClan == null) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java index 8273025f1b..d32d66bb5b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -59,7 +60,7 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket return; } - LOGGER.info("RequestSurrenderPledgeWar by " + player.getClan().getName() + " with " + _pledgeName); + PacketLogger.info("RequestSurrenderPledgeWar by " + player.getClan().getName() + " with " + _pledgeName); if (!playerclan.isAtWarWith(clan.getClanId())) { player.sendMessage("You aren't at war with this clan."); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWearItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWearItem.java index 132e0e5d2f..3ebc902864 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWearItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWearItem.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -69,7 +70,7 @@ public class RequestWearItem implements IClientIncomingPacket } catch (Throwable e) { - LOGGER.warning(e.getMessage()); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } @@ -148,7 +149,7 @@ public class RequestWearItem implements IClientIncomingPacket final Merchant merchant = (target != null) && (target instanceof Merchant) ? (Merchant) target : null; if (merchant == null) { - LOGGER.warning("Null merchant!"); + PacketLogger.warning(getClass().getSimpleName() + ": Null merchant!"); 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 84e4cf842c..682659b3ab 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 @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player.PunishLevel; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -101,14 +102,14 @@ public class Say2 implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.warning("[Say2.java] Active Character is null."); + PacketLogger.warning("[Say2.java] Active Character is null."); return; } ChatType chatType = ChatType.findByClientId(_type); if (chatType == null) { - LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); + PacketLogger.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); return; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java index 37f85ee5a1..65ac4a7789 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.handler.AdminCommandHandler; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.util.GMAudit; /** @@ -56,7 +57,7 @@ public class SendBypassBuildCmd implements IClientIncomingPacket if (handler == null) { player.sendMessage("The command " + _command + " does not exist!"); - LOGGER.warning("No handler registered for admin command '" + _command + "'."); + PacketLogger.warning("No handler registered for admin command '" + _command + "'."); return; } @@ -64,7 +65,7 @@ public class SendBypassBuildCmd implements IClientIncomingPacket if (!AdminData.getInstance().hasAccess(_command, player.getAccessLevel())) { player.sendMessage("You don't have the access right to use this command!"); - LOGGER.warning("Character " + player.getName() + " tried to use admin command " + _command + ", but doesn't have access to it!"); + PacketLogger.warning("Character " + player.getName() + " tried to use admin command " + _command + ", but doesn't have access to it!"); return; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 0e607aa11c..93c5d159a6 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.EnchantResult; @@ -166,7 +167,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item item = player.checkItemManipulation(objectId, count, "deposit"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); _items[(i * 2) + 0] = 0; _items[(i * 2) + 1] = 0; continue; @@ -223,7 +224,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item oldItem = player.getInventory().getItemByObjectId(objectId); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); continue; } @@ -235,14 +236,14 @@ public class SendWareHouseDepositList implements IClientIncomingPacket if (CursedWeaponsManager.getInstance().isCursed(itemId)) { - LOGGER.warning(player.getName() + " try to deposit Cursed Weapon on wherehouse."); + PacketLogger.warning(player.getName() + " try to deposit Cursed Weapon on wherehouse."); continue; } final Item newItem = player.getInventory().transferItem("Warehouse", objectId, count, warehouse, player, player.getLastFolkNPC()); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index a99759e0b6..736804403b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.EnchantResult; @@ -189,7 +190,7 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket final Item newItem = warehouse.transferItem("Warehouse", objectId, count, player.getInventory(), player, player.getLastFolkNPC()); if (newItem == null) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName()); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName()); continue; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectInfo.java index 5cadaf2bed..3950ecc5d0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectInfo.java @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @version $Revision: 1.8.2.4.2.6 $ $Date: 2005/04/06 16:13:46 $ @@ -226,7 +227,7 @@ public class CharSelectInfo implements IClientOutgoingPacket } catch (Exception e) { - LOGGER.warning(e.toString()); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } return characterList; @@ -252,7 +253,7 @@ public class CharSelectInfo implements IClientOutgoingPacket } catch (Exception e) { - LOGGER.warning(e.toString()); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } @@ -332,7 +333,7 @@ public class CharSelectInfo implements IClientOutgoingPacket } catch (Exception e) { - LOGGER.warning("Could not restore augmentation info: " + e); + PacketLogger.warning(getClass().getSimpleName() + ": Could not restore augmentation info: " + e.getMessage()); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index 982959201e..35ff495b46 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IOutgoingPacket; import org.l2jmobius.gameserver.model.actor.Player; @@ -26,8 +24,6 @@ import org.l2jmobius.gameserver.model.actor.Player; */ public interface IClientOutgoingPacket extends IOutgoingPacket { - Logger LOGGER = Logger.getLogger(IClientOutgoingPacket.class.getName()); - default void runImpl(Player player) { } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java index d0051da620..0a96399834 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java @@ -21,6 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.util.BuilderUtil; /** @@ -181,14 +182,14 @@ public class NpcHtmlMessage implements IClientOutgoingPacket { if (text == null) { - LOGGER.warning("Html is null! this will crash the client!"); + PacketLogger.warning("Html is null! This will crash the client!"); _html = ""; return; } if (text.length() > 8192) { - LOGGER.warning("Html is too long! this will crash the client!"); + PacketLogger.warning("Html is too long! This will crash the client!"); _html = "Html was too long,
Try to use DB for this action"; return; } @@ -207,7 +208,7 @@ public class NpcHtmlMessage implements IClientOutgoingPacket if (content == null) { setHtml("My Text is missing:
" + path + ""); - LOGGER.warning("missing html page " + path); + PacketLogger.warning("Missing html page " + path); return false; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index b29b42ab17..e35e864754 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Shows the Siege Info
@@ -90,7 +91,7 @@ public class SiegeInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Null owner for castle: " + _name); + PacketLogger.warning("Null owner for castle: " + _name); } } else diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index b6c4f7b18f..d353d7edb9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -22,6 +22,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * 0x42 WarehouseWithdrawalList dh (h dddhh dhhh d) @@ -47,7 +48,7 @@ public class WareHouseWithdrawalList implements IClientOutgoingPacket if (_player.getActiveWarehouse() == null) { // Something went wrong! - LOGGER.warning("error while sending withdraw request to: " + _player.getName()); + PacketLogger.warning("Error while sending withdraw request to: " + _player.getName()); return; } _items = _player.getActiveWarehouse().getItems(); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/PacketLogger.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/PacketLogger.java new file mode 100644 index 0000000000..5b5a083a99 --- /dev/null +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/PacketLogger.java @@ -0,0 +1,42 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.network; + +import java.util.logging.Logger; + +/** + * @author Mobius + */ +public class PacketLogger +{ + private static final Logger LOGGER = Logger.getLogger(PacketLogger.class.getName()); + + public static synchronized void warning(String message) + { + LOGGER.warning(message); + } + + public static synchronized void info(String message) + { + LOGGER.info(message); + } + + public static synchronized void finer(String message) + { + LOGGER.finer(message); + } +} diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 7d2dd29717..a7de76689d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -161,7 +162,7 @@ public class Action implements IClientIncomingPacket default: { // Invalid action detected (probably client cheating), log this - LOGGER.warning("[C] Action: Character: " + player.getName() + " requested invalid action: " + _actionId); + PacketLogger.warning("[C] Action: Character: " + player.getName() + " requested invalid action: " + _actionId); client.sendPacket(ActionFailed.STATIC_PACKET); break; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index 7beb86ba69..d6b3543d1a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; import org.l2jmobius.gameserver.network.serverpackets.TradeOwnAdd; @@ -56,7 +57,7 @@ public class AddTradeItem implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - LOGGER.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); + PacketLogger.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); return; } @@ -66,7 +67,7 @@ public class AddTradeItem implements IClientIncomingPacket // Trade partner not found, cancel trade if (partner != null) { - LOGGER.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); + PacketLogger.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); } player.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE); player.cancelActiveTrade(); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 132d577a07..4ef9f7ff03 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -47,6 +47,7 @@ import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; import org.l2jmobius.gameserver.network.serverpackets.CharCreateOk; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -120,21 +121,21 @@ public class CharacterCreate implements IClientIncomingPacket if ((_face > 2) || (_face < 0)) { - LOGGER.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairStyle < 0) || ((_sex == 0) && (_hairStyle > 4)) || ((_sex != 0) && (_hairStyle > 6))) { - LOGGER.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairColor > 3) || (_hairColor < 0)) { - LOGGER.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } @@ -290,7 +291,7 @@ public class CharacterCreate implements IClientIncomingPacket final Item item = newChar.getInventory().addItem("Init", ie.getId(), ie.getCount(), newChar, null); if (item == null) { - LOGGER.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); + PacketLogger.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); continue; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java index 4fe09968c6..840348983f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java @@ -16,14 +16,13 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Level; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDelete; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteFail; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteSuccess; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -82,7 +81,7 @@ public class CharacterDelete implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Error:", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1, 0); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 78e99cafe1..d01954c1ca 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -72,6 +72,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; @@ -141,7 +142,7 @@ public class EnterWorld implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.warning("EnterWorld failed! player returned 'null'."); + PacketLogger.warning("EnterWorld failed! player returned 'null'."); Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java index 61772287a2..580f082b42 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java @@ -25,9 +25,13 @@ import org.l2jmobius.gameserver.network.GameClient; */ public class ExGetOnAirShip implements IClientIncomingPacket { + @SuppressWarnings("unused") private int _x; + @SuppressWarnings("unused") private int _y; + @SuppressWarnings("unused") private int _z; + @SuppressWarnings("unused") private int _shipId; @Override @@ -43,9 +47,9 @@ public class ExGetOnAirShip implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("[T1:ExGetOnAirShip] x: " + _x); - LOGGER.info("[T1:ExGetOnAirShip] y: " + _y); - LOGGER.info("[T1:ExGetOnAirShip] z: " + _z); - LOGGER.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); + // PacketLogger.info("[T1:ExGetOnAirShip] x: " + _x); + // PacketLogger.info("[T1:ExGetOnAirShip] y: " + _y); + // PacketLogger.info("[T1:ExGetOnAirShip] z: " + _z); + // PacketLogger.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java index fcdd8335f4..4e91188f5c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java @@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Arrays; -import java.util.logging.Level; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: c dddd @@ -79,7 +79,7 @@ public class GameGuardReply implements IClientIncomingPacket } catch (NoSuchAlgorithmException e) { - LOGGER.log(Level.WARNING, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java index eddff9f891..62e69acd86 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.gameserver.network.GameClient; @@ -27,5 +25,4 @@ import org.l2jmobius.gameserver.network.GameClient; */ public interface IClientIncomingPacket extends IIncomingPacket { - Logger LOGGER = Logger.getLogger(IClientIncomingPacket.class.getName()); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 816f9085e6..73c497a4d1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.multisell.Entry; import org.l2jmobius.gameserver.model.multisell.Ingredient; import org.l2jmobius.gameserver.model.multisell.PreparedListContainer; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; @@ -143,7 +144,7 @@ public class MultiSellChoose implements IClientIncomingPacket { if (!entry.isStackable() && (_amount > 1)) { - LOGGER.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell, id:" + _listId + ":" + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell, id:" + _listId + ":" + _entryId); player.setMultiSell(null); return; } @@ -265,7 +266,7 @@ public class MultiSellChoose implements IClientIncomingPacket Item itemToTake = inv.getItemByItemId(e.getItemId()); // initialize and initial guess for the item to take. if (itemToTake == null) { // this is a cheat, transaction will be aborted and if any items already taken will not be returned back to inventory! - LOGGER.severe("Character: " + player.getName() + " is trying to cheat in multisell, id:" + _listId + ":" + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to cheat in multisell, id:" + _listId + ":" + _entryId); player.setMultiSell(null); return; } 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 5559da01ab..0ab14c10e5 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 @@ -43,6 +43,7 @@ import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillDone; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillList; @@ -96,7 +97,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if ((_level < 1) || (_level > 1000) || (_id < 1) || (_id > 32000)) { Util.handleIllegalPlayerAction(player, "Wrong Packet Data in Aquired Skill", Config.DEFAULT_PUNISH); - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); return; } @@ -109,7 +110,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level); if (skill == null) { - LOGGER.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -312,7 +313,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket } else { - LOGGER.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 " + player.getName() + "!"); return; } } @@ -346,12 +347,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket } else { - LOGGER.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 " + player.getName() + "!"); } } else { - LOGGER.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 " + player.getName() + "!"); } } } @@ -372,7 +373,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket } default: { - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); break; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 9aa5308894..ab8d3762f7 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillInfo; /** @@ -52,7 +53,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket { if ((_id <= 0) || (_level <= 0)) { - LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); return; } @@ -71,7 +72,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level); if (skill == null) { - LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); + PacketLogger.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); return; } 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 f2f20c4c04..9fd731f2b1 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 @@ -48,6 +48,7 @@ import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.NpcStringId; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ChairSit; @@ -125,7 +126,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().getId()); + PacketLogger.warning("Player " + 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/RequestAnswerFriendInvite.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerFriendInvite.java index 851f4b20ca..4fa42b1f5c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerFriendInvite.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerFriendInvite.java @@ -18,12 +18,12 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.FriendPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -92,7 +92,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e); + PacketLogger.warning("Could not add friend objectid: " + e.getMessage()); } } else diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java index 56fac1841d..176538531e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; public class RequestBlock implements IClientIncomingPacket @@ -107,7 +108,7 @@ public class RequestBlock implements IClientIncomingPacket } default: { - LOGGER.info("Unknown 0xA9 block type: " + _type); + PacketLogger.info("Unknown 0xA9 block type: " + _type); } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBrBuyProduct.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBrBuyProduct.java index 437880c790..c1755df94e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBrBuyProduct.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBrBuyProduct.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; @@ -29,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.PrimeShopProductHolder; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ExBrBuyProduct; import org.l2jmobius.gameserver.network.serverpackets.ExBrGamePoint; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; @@ -132,7 +132,7 @@ public class RequestBrBuyProduct implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Could not save Item Mall transaction: " + e.getMessage(), e); + PacketLogger.warning("Could not save Item Mall transaction: " + e.getMessage()); } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index d7370194e7..ea672b97d0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.buylist.BuyListHolder; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -178,7 +179,7 @@ public class RequestBuyItem implements IClientIncomingPacket if (price < 0) { - LOGGER.warning("ERROR, no price found .. wrong buylist ??"); + PacketLogger.warning("ERROR, no price found .. wrong buylist ??"); client.sendPacket(ActionFailed.STATIC_PACKET); 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 70051935e0..f1c9d8d6ac 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.StringTokenizer; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -39,6 +38,7 @@ import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -84,7 +84,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -181,7 +181,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (NumberFormatException nfe) { - LOGGER.log(Level.WARNING, "NFE for command [" + _command + "]", nfe); + PacketLogger.warning("NFE for command [" + _command + "] " + nfe.getMessage()); } } else if (_command.startsWith("_match")) @@ -248,13 +248,13 @@ public class RequestBypassToServer implements IClientIncomingPacket } else { - LOGGER.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); + PacketLogger.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); } } } catch (Exception e) { - LOGGER.log(Level.WARNING, "Exception processing bypass from player " + player.getName() + ": " + _command, e); + PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _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/RequestCrystallizeItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index d95eb25567..50edf85161 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -55,7 +56,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.fine("RequestCrystalizeItem: activeChar was null"); + // PacketLogger.finer("RequestCrystalizeItem: activeChar was null"); return; } @@ -84,7 +85,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - LOGGER.info("Player " + client + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info("Player " + client + " used crystalize with classid: " + player.getClassId().getId()); } return; } @@ -113,7 +114,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket if (!itemToRemove.getItem().isCrystallizable() || (itemToRemove.getItem().getCrystalCount() <= 0) || (itemToRemove.getItem().getCrystalType() == CrystalType.NONE)) { - LOGGER.warning(player.getName() + " (" + player.getObjectId() + ") tried to crystallize " + itemToRemove.getItem().getId()); + PacketLogger.warning(player.getName() + " (" + player.getObjectId() + ") tried to crystallize " + itemToRemove.getItem().getId()); return; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 5597f7200e..5839091933 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; @@ -29,6 +28,7 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; @@ -151,7 +151,7 @@ public class RequestDestroyItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not delete pet objectid: ", e); + PacketLogger.warning("Could not delete pet objectid: " + e.getMessage()); } } if (itemToRemove.isTimeLimitedItem()) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index dda1884b43..f051329a2a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; @@ -225,7 +226,7 @@ public class RequestDropItem implements IClientIncomingPacket if ((dropedItem != null) && (dropedItem.getId() == Inventory.ADENA_ID) && (dropedItem.getCount() >= 1000000)) { final String msg = "Character (" + player.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")"; - LOGGER.warning(msg); + PacketLogger.warning(msg); AdminData.getInstance().broadcastMessageToGMs(msg); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java index 30fb0b64e9..c3602b7366 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ExNeedToChangeName; /** @@ -42,6 +43,6 @@ public class RequestExChangeName implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("Recieved [C]RequestExChangeName name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); + PacketLogger.info("Recieved [C]RequestExChangeName name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java index 6e4861568e..c2f02f89ad 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chdd d: Arena d: Team @@ -74,7 +75,7 @@ public class RequestExCubeGameChangeTeam implements IClientIncomingPacket } default: { - LOGGER.warning("Wrong Cube Game Team ID: " + _team); + PacketLogger.warning("Wrong Cube Game Team ID: " + _team); break; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java index 009b836b6d..d72fdfc413 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chddd d: Arena d: Answer @@ -64,7 +65,7 @@ public class RequestExCubeGameReadyAnswer implements IClientIncomingPacket } default: { - LOGGER.warning("Unknown Cube Game Answer ID: " + _answer); + PacketLogger.warning("Unknown Cube Game Answer ID: " + _answer); break; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index f16bc64bfd..235a80e29c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; import org.l2jmobius.gameserver.util.Broadcast; @@ -86,7 +87,7 @@ public class RequestExMagicSkillUseGround implements IClientIncomingPacket else { player.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("No skill found with id " + _skillId + " and level " + level + " !!"); + PacketLogger.warning("No skill found with id " + _skillId + " and level " + level + " !!"); } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 2d110363b9..95e26fa980 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Level; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; @@ -25,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; @@ -71,7 +70,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket player.sendPacket(new ExPutEnchantTargetItemResult(0)); if (scrollTemplate == null) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); + PacketLogger.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); } return; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java index 05e09e6dfc..0a4522bf64 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressMapInfo; @@ -43,7 +44,7 @@ public class RequestFortressMapInfo implements IClientIncomingPacket final Fort fort = FortManager.getInstance().getFortById(_fortressId); if (fort == null) { - LOGGER.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); + PacketLogger.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); if (client.getPlayer() == null) { return; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestFriendDel.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestFriendDel.java index 83742d59ca..d074a71e8e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestFriendDel.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestFriendDel.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -26,6 +25,7 @@ import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.FriendPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -98,7 +98,7 @@ public class RequestFriendDel implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not del friend objectid: ", e); + PacketLogger.warning(getClass().getSimpleName() + ": Could not delele friend objectId: " + e.getMessage()); } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java index 81b521f295..f0bdef4cf3 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java @@ -22,6 +22,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.RaidBossPointsManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ExGetBossRecord; /** @@ -50,7 +51,7 @@ public class RequestGetBossRecord implements IClientIncomingPacket if (_bossId != 0) { - LOGGER.info("C5: RequestGetBossRecord: d: " + _bossId + " ActiveChar: " + player); // should be always 0, log it if isnt 0 for furture research + PacketLogger.info("C5: RequestGetBossRecord: d: " + _bossId + " ActiveChar: " + player); // should be always 0, log it if isnt 0 for furture research } final int points = RaidBossPointsManager.getInstance().getPointsByOwnerId(player.getObjectId()); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index 02f1633c90..363b649cfc 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.util.Util; /** @@ -78,7 +79,7 @@ public class RequestGetItemFromPet implements IClientIncomingPacket if (pet.transferItem("Transfer", _objectId, _amount, player.getInventory(), player, pet) == null) { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 20db5022d4..ed7ae07d03 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; @@ -117,7 +118,7 @@ public class RequestGiveItemToPet implements IClientIncomingPacket if (player.transferItem("Transfer", _objectId, _amount, pet.getInventory(), pet) == null) { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } 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 c7f51c1de5..78604ed9fd 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 @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -65,7 +66,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning(getClass().getName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); client.sendActionFailed(); return; } 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 6ff69e5355..66954debe1 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; /** @@ -51,7 +52,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - LOGGER.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); } client.sendActionFailed(); 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 60854d1a90..c5477ad459 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; /** @@ -49,7 +50,7 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning(getClass().getName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); client.sendActionFailed(); 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 44b26abac9..908f6a2813 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; /** @@ -74,7 +75,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); client.sendActionFailed(); } } 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 6e5ddb0942..c9f27ad24c 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 @@ -21,6 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -50,20 +51,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - LOGGER.warning("Player " + actor.getName() + " sent empty html link!"); + PacketLogger.warning("Player " + actor.getName() + " sent empty html link!"); return; } if (_link.contains("..")) { - LOGGER.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); return; } final int htmlObjectId = actor.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - LOGGER.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 2a31191bcb..2b9edcb0ea 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListDelete; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -72,7 +73,7 @@ public class RequestOustPledgeMember implements IClientIncomingPacket final ClanMember member = clan.getClanMember(_target); if (member == null) { - LOGGER.warning("Target (" + _target + ") is not member of the clan"); + PacketLogger.warning("Target (" + _target + ") is not member of the clan"); return; } if (member.isOnline() && member.getPlayer().isInCombat()) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java index 9702554c3b..209835b319 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) S @@ -37,6 +38,6 @@ public class RequestPCCafeCouponUse implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestPCCafeCouponUse: S: " + _str); + PacketLogger.info("C5: RequestPCCafeCouponUse: S: " + _str); } } 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 5c9f93f74d..d6075cb0ea 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 @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Level; - import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; @@ -29,6 +27,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; @@ -124,7 +123,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item item = player.checkItemManipulation(i.getId(), i.getCount(), "freight"); if (item == null) { - LOGGER.log(Level.WARNING, "Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); warehouse.deleteMe(); return; } @@ -173,7 +172,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { - LOGGER.log(Level.WARNING, "Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); warehouse.deleteMe(); return; } @@ -181,7 +180,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem("Trade", i.getId(), i.getCount(), warehouse, player, null); if (newItem == null) { - LOGGER.log(Level.WARNING, "Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java index fdc9f54210..fa76806f55 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java @@ -64,7 +64,7 @@ public class RequestPartyMatchList implements IClientIncomingPacket final PartyMatchRoom room = PartyMatchRoomList.getInstance().getRoom(_roomid); if (room != null) { - LOGGER.info("PartyMatchRoom #" + room.getId() + " changed by " + player.getName()); + // PacketLogger.info("PartyMatchRoom #" + room.getId() + " changed by " + player.getName()); room.setMaxMembers(_membersmax); room.setMinLevel(_minLevel); room.setMaxLevel(_maxLevel); @@ -88,7 +88,7 @@ public class RequestPartyMatchList implements IClientIncomingPacket final int maxid = PartyMatchRoomList.getInstance().getMaxId(); final PartyMatchRoom room = new PartyMatchRoom(maxid, _roomtitle, _loot, _minLevel, _maxLevel, _membersmax, player); - LOGGER.info("PartyMatchRoom #" + maxid + " created by " + player.getName()); + // PacketLogger.info("PartyMatchRoom #" + maxid + " created by " + player.getName()); // Remove from waiting list PartyMatchWaitingList.getInstance().removePlayer(player); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 61715121bc..24fbf0eb78 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -136,7 +137,7 @@ public class RequestPetUseItem implements IClientIncomingPacket else { player.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM); - LOGGER.warning("No item handler registered for itemId: " + item.getId()); + PacketLogger.warning("No item handler registered for itemId: " + item.getId()); } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index 2a4363230f..af09102efa 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -19,13 +19,13 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Plim @@ -74,7 +74,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket } catch (SQLException e) { - LOGGER.log(Level.SEVERE, "Error while saving petition feedback"); + PacketLogger.warning(getClass().getSimpleName() + ": Error while saving petition feedback: " + e.getMessage()); } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java index fc3386625e..8c5e2ee3d9 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java @@ -44,8 +44,8 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket @Override public void run(GameClient client) { - // LOGGER.info("C5: RequestPledgeMemberInfo d:"+_unk1); - // LOGGER.info("C5: RequestPledgeMemberInfo S:"+_player); + // PacketLogger.info("C5: RequestPledgeMemberInfo d:"+_unk1); + // PacketLogger.info("C5: RequestPledgeMemberInfo S:"+_player); final Player player = client.getPlayer(); if (player == null) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index df9f52bac1..d16cb82368 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.HashMap; import java.util.Map; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -37,6 +36,7 @@ import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ShopPreviewInfo; @@ -73,7 +73,7 @@ public class RequestPreviewItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } @@ -151,7 +151,7 @@ public class RequestPreviewItem implements IClientIncomingPacket final Merchant merchant = (target instanceof Merchant) ? (Merchant) target : null; if (merchant == null) { - LOGGER.warning(getClass().getName() + " Null merchant!"); + PacketLogger.warning(getClass().getName() + ": Null merchant!"); 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 5ce6e3980e..2b28f271af 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.util.Util; @@ -141,7 +142,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if (result > 1) { - LOGGER.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); } return; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java index e3b6bd2d41..024db347c5 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; /** @@ -131,7 +132,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket if (!storeList.privateStoreSell(player, _items)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); return; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index e2e682cbd7..847b056759 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.buylist.BuyListHolder; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -194,7 +195,7 @@ public class RequestRefundItem implements IClientIncomingPacket final Item item = player.getRefund().transferItem("Refund", objectIds[i], Long.MAX_VALUE, player.getInventory(), player, player.getLastFolkNPC()); if (item == null) { - LOGGER.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index ee78579ea4..8a2f42272a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket { @@ -54,7 +55,7 @@ public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket } else { - LOGGER.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); + PacketLogger.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); } player.onTransactionRequest(requestor); } 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 406448da01..b8e34e6ddb 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 @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.sevensigns.SevenSignsFestival; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -70,7 +71,7 @@ public class RequestRestart implements IClientIncomingPacket if (player.isLocked()) { - LOGGER.warning("Player " + player.getName() + " tried to restart during class change."); + PacketLogger.warning("Player " + player.getName() + " tried to restart during class change."); client.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/RequestRestartPoint.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index 6409d8b57b..63f2fff99e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.clanhalls.SiegableHall; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @version $Revision: 1.7.2.3.2.6 $ $Date: 2005/03/27 15:29:30 $ @@ -145,7 +146,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if ((player.getClan() == null) || (player.getClan().getHideoutId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.CLANHALL); @@ -171,7 +172,7 @@ public class RequestRestartPoint implements IClientIncomingPacket } else { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); return; } } @@ -193,7 +194,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if (((player.getClan() == null) || (player.getClan().getFortId() == 0)) && !isInDefense) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.FORTRESS); @@ -234,7 +235,7 @@ public class RequestRestartPoint implements IClientIncomingPacket } } - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.SIEGEFLAG); @@ -244,7 +245,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if (!player.isGM() && !player.isFestivalParticipant() && !player.getInventory().haveItemForSelfResurrection()) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); return; } if (player.isGM() || player.destroyItemByItemId("Feather", 10649, 1, player, false) || player.destroyItemByItemId("Feather", 13300, 1, player, false) || player.destroyItemByItemId("Feather", 13128, 1, player, false)) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 26f568f261..330bcfd5a5 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExNoticePostSent; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -313,14 +314,14 @@ public class RequestSendPost implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getObjectId(), i.getCount(), "attach"); if ((oldItem == null) || !oldItem.isTradeable() || oldItem.isEquipped()) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); return false; } final Item newItem = player.getInventory().transferItem("SendMail", i.getObjectId(), i.getCount(), attachments, player, receiver); if (newItem == null) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java index 3831e83440..5ae43534f0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.Calendar; import java.util.Date; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -26,6 +25,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -55,17 +55,17 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket final Castle castle = CastleManager.getInstance().getCastleById(_castleId); if ((player == null) || (castle == null)) { - LOGGER.log(Level.WARNING, "[C]RequestSetCastleSiegeTime: activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); + PacketLogger.warning("[C]RequestSetCastleSiegeTime: activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); return; } if ((castle.getOwnerId() > 0) && (castle.getOwnerId() != player.getClanId())) { - LOGGER.log(Level.WARNING, "[C]RequestSetCastleSiegeTime: activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); + PacketLogger.warning("[C]RequestSetCastleSiegeTime: activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); } else if (!player.isClanLeader()) { - LOGGER.log(Level.WARNING, "[C]RequestSetCastleSiegeTime: activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); + PacketLogger.warning("[C]RequestSetCastleSiegeTime: activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); } else if (!castle.isTimeRegistrationOver()) { @@ -81,12 +81,12 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket } else { - LOGGER.log(Level.WARNING, "[C]RequestSetCastleSiegeTime: activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); + PacketLogger.warning("[C]RequestSetCastleSiegeTime: activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); } } else { - LOGGER.log(Level.WARNING, "[C]RequestSetCastleSiegeTime: activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); + PacketLogger.warning("[C]RequestSetCastleSiegeTime: activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java index e1adec4dbb..204484db56 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -57,7 +58,7 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket return; } - LOGGER.info("RequestSurrenderPledgeWar by " + client.getPlayer().getClan().getName() + " with " + _pledgeName); + PacketLogger.info("RequestSurrenderPledgeWar by " + client.getPlayer().getClan().getName() + " with " + _pledgeName); if (!playerClan.isAtWarWith(clan.getId())) { player.sendMessage("You aren't at war with this clan."); 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 352d88f71a..a3a3d850c2 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 @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.events.returns.ChatFilterReturn; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; @@ -109,7 +110,7 @@ public class Say2 implements IClientIncomingPacket ChatType chatType = ChatType.findByClientId(_type); if (chatType == null) { - LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); + PacketLogger.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -117,7 +118,7 @@ public class Say2 implements IClientIncomingPacket if (_text.isEmpty()) { - LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); + PacketLogger.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -204,7 +205,7 @@ public class Say2 implements IClientIncomingPacket } else { - LOGGER.info("No handler registered for ChatType: " + _type + " Player: " + client); + PacketLogger.info("No handler registered for ChatType: " + _type + " Player: " + client); } } @@ -252,7 +253,7 @@ public class Say2 implements IClientIncomingPacket { if (owner.getInventory().getItemByObjectId(id) == null) { - LOGGER.info(owner.getClient() + " trying publish item which doesnt own! ID:" + id); + PacketLogger.info(owner.getClient() + " trying publish item which doesnt own! ID:" + id); return false; } ((Item) item).publish(); @@ -264,7 +265,7 @@ public class Say2 implements IClientIncomingPacket pos1 = _text.indexOf(8, pos) + 1; if (pos1 == 0) // missing ending tag { - LOGGER.info(owner.getClient() + " sent invalid publish item msg! ID:" + id); + PacketLogger.info(owner.getClient() + " sent invalid publish item msg! ID:" + id); return false; } } 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 249e5d95a7..608a8e9c1b 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 @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; @@ -129,7 +130,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item item = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); return; } @@ -176,7 +177,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } @@ -188,7 +189,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem(warehouse.getName(), itemHolder.getId(), itemHolder.getCount(), warehouse, player, manager); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index b1af21fc5c..1fb4492d77 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; @@ -170,13 +171,13 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket final Item oldItem = warehouse.getItemByObjectId(i.getId()); if ((oldItem == null) || (oldItem.getCount() < i.getCount())) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } final Item newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, manager); if (newItem == null) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); return; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 8e6e8008f9..2f44afd3a4 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.concurrent.TimeUnit; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -44,6 +43,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUseSharedGroupItem; @@ -330,7 +330,7 @@ public class UseItem implements IClientIncomingPacket { if ((etcItem != null) && (etcItem.getHandlerName() != null)) { - LOGGER.log(Level.WARNING, "Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); + PacketLogger.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); } return; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 33eeff5060..1b8ddb2042 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -16,11 +16,10 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Level; - import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.util.Util; /** @@ -75,7 +74,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { if (html.length() > 17200) { - LOGGER.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable()); + PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } @@ -94,7 +93,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket if (content == null) { setHtml("My Text is missing:
" + path + ""); - LOGGER.warning("missing html page " + path); + PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBrRecentProductList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBrRecentProductList.java index fb5d7ea7a9..9bbd39371e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBrRecentProductList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBrRecentProductList.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.ArrayList; import java.util.List; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; @@ -29,6 +28,7 @@ import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.PrimeShopProductHolder; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Mobius @@ -59,7 +59,7 @@ public class ExBrRecentProductList implements IClientOutgoingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Could not restore Item Mall transaction: " + e.getMessage(), e); + PacketLogger.warning("Could not restore Item Mall transaction: " + e.getMessage()); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index c40c8c925a..6ad26ac9bc 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Migi, DS @@ -44,7 +45,7 @@ public class ExReplyReceivedPost implements IClientOutgoingPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index ba20402c72..473a646d49 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * ExReplySentPost packet implementation. @@ -45,7 +46,7 @@ public class ExReplySentPost implements IClientOutgoingPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index 1164c4182f..1a110025a6 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author KenM @@ -46,7 +47,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); + PacketLogger.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); packet.writeS(""); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index 63f368277f..9d3bb66b00 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IOutgoingPacket; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -27,8 +25,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; */ public interface IClientOutgoingPacket extends IOutgoingPacket { - Logger LOGGER = Logger.getLogger(IClientOutgoingPacket.class.getName()); - int[] PAPERDOLL_ORDER = new int[] { Inventory.PAPERDOLL_UNDER, diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 96885d69b1..a997d41772 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan.SubPledge; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author -Wooden- @@ -60,7 +61,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket } else if (_clan.getClanMember(LeaderId) == null) { - LOGGER.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); + PacketLogger.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); return ""; } else diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index 2becbf0fff..37f018ccd3 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.RecipeData; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class RecipeItemMakeInfo implements IClientOutgoingPacket { @@ -57,7 +58,7 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket } else { - LOGGER.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); + PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); } return true; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 679ec50ba0..62cceeee49 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Shows the Siege Info
@@ -86,7 +87,7 @@ public class SiegeInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Null owner for castle: " + _castle.getName()); + PacketLogger.warning("Null owner for castle: " + _castle.getName()); } } else @@ -137,7 +138,7 @@ public class SiegeInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Null owner for siegable hall: " + _hall.getName()); + PacketLogger.warning("Null owner for siegable hall: " + _hall.getName()); } } else diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java index 2f1c3d678d..aeff5f3aaa 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.item.type.MaterialType; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket { @@ -94,7 +95,7 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket if (player.getActiveWarehouse() == null) { // Something went wrong! - LOGGER.warning("error while sending withdraw request to: " + player.getName()); + PacketLogger.warning("Error while sending withdraw request to: " + player.getName()); return; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 33ea8cc1c9..0e0cb96669 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Arrays; -import java.util.logging.Level; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.ItemTable; @@ -29,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; @@ -148,7 +148,7 @@ public class SystemMessage implements IClientOutgoingPacket { _params = Arrays.copyOf(_params, _paramIndex + 1); _smId.setParamCount(_paramIndex + 1); - LOGGER.log(Level.INFO, "Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); + PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } _params[_paramIndex++] = param; @@ -369,7 +369,7 @@ public class SystemMessage implements IClientOutgoingPacket { if (param == null) { - LOGGER.warning("Found null parameter for SystemMessageId " + _smId); + PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 3212decd51..3f7b5b02b4 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -22,6 +22,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class WareHouseWithdrawalList implements IClientOutgoingPacket { @@ -45,7 +46,7 @@ public class WareHouseWithdrawalList implements IClientOutgoingPacket { if (player.getActiveWarehouse() == null) { - LOGGER.warning("error while sending withdraw request to: " + player.getName()); + PacketLogger.warning("Error while sending withdraw request to: " + player.getName()); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/PacketLogger.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/PacketLogger.java new file mode 100644 index 0000000000..5b5a083a99 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/PacketLogger.java @@ -0,0 +1,42 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.network; + +import java.util.logging.Logger; + +/** + * @author Mobius + */ +public class PacketLogger +{ + private static final Logger LOGGER = Logger.getLogger(PacketLogger.class.getName()); + + public static synchronized void warning(String message) + { + LOGGER.warning(message); + } + + public static synchronized void info(String message) + { + LOGGER.info(message); + } + + public static synchronized void finer(String message) + { + LOGGER.finer(message); + } +} diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 7d2dd29717..a7de76689d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -161,7 +162,7 @@ public class Action implements IClientIncomingPacket default: { // Invalid action detected (probably client cheating), log this - LOGGER.warning("[C] Action: Character: " + player.getName() + " requested invalid action: " + _actionId); + PacketLogger.warning("[C] Action: Character: " + player.getName() + " requested invalid action: " + _actionId); client.sendPacket(ActionFailed.STATIC_PACKET); break; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index 7beb86ba69..d6b3543d1a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; import org.l2jmobius.gameserver.network.serverpackets.TradeOwnAdd; @@ -56,7 +57,7 @@ public class AddTradeItem implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - LOGGER.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); + PacketLogger.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); return; } @@ -66,7 +67,7 @@ public class AddTradeItem implements IClientIncomingPacket // Trade partner not found, cancel trade if (partner != null) { - LOGGER.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); + PacketLogger.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); } player.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE); player.cancelActiveTrade(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 132d577a07..4ef9f7ff03 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -47,6 +47,7 @@ import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; import org.l2jmobius.gameserver.network.serverpackets.CharCreateOk; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -120,21 +121,21 @@ public class CharacterCreate implements IClientIncomingPacket if ((_face > 2) || (_face < 0)) { - LOGGER.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairStyle < 0) || ((_sex == 0) && (_hairStyle > 4)) || ((_sex != 0) && (_hairStyle > 6))) { - LOGGER.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairColor > 3) || (_hairColor < 0)) { - LOGGER.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } @@ -290,7 +291,7 @@ public class CharacterCreate implements IClientIncomingPacket final Item item = newChar.getInventory().addItem("Init", ie.getId(), ie.getCount(), newChar, null); if (item == null) { - LOGGER.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); + PacketLogger.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); continue; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java index 4fe09968c6..840348983f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java @@ -16,14 +16,13 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Level; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDelete; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteFail; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteSuccess; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -82,7 +81,7 @@ public class CharacterDelete implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Error:", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1, 0); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 6e50d0ed69..505d0f6177 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -71,6 +71,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; @@ -142,7 +143,7 @@ public class EnterWorld implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.warning("EnterWorld failed! player returned 'null'."); + PacketLogger.warning("EnterWorld failed! player returned 'null'."); Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java index 61772287a2..580f082b42 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java @@ -25,9 +25,13 @@ import org.l2jmobius.gameserver.network.GameClient; */ public class ExGetOnAirShip implements IClientIncomingPacket { + @SuppressWarnings("unused") private int _x; + @SuppressWarnings("unused") private int _y; + @SuppressWarnings("unused") private int _z; + @SuppressWarnings("unused") private int _shipId; @Override @@ -43,9 +47,9 @@ public class ExGetOnAirShip implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("[T1:ExGetOnAirShip] x: " + _x); - LOGGER.info("[T1:ExGetOnAirShip] y: " + _y); - LOGGER.info("[T1:ExGetOnAirShip] z: " + _z); - LOGGER.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); + // PacketLogger.info("[T1:ExGetOnAirShip] x: " + _x); + // PacketLogger.info("[T1:ExGetOnAirShip] y: " + _y); + // PacketLogger.info("[T1:ExGetOnAirShip] z: " + _z); + // PacketLogger.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java index fcdd8335f4..4e91188f5c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java @@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Arrays; -import java.util.logging.Level; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: c dddd @@ -79,7 +79,7 @@ public class GameGuardReply implements IClientIncomingPacket } catch (NoSuchAlgorithmException e) { - LOGGER.log(Level.WARNING, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java index eddff9f891..62e69acd86 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.gameserver.network.GameClient; @@ -27,5 +25,4 @@ import org.l2jmobius.gameserver.network.GameClient; */ public interface IClientIncomingPacket extends IIncomingPacket { - Logger LOGGER = Logger.getLogger(IClientIncomingPacket.class.getName()); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 816f9085e6..73c497a4d1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.multisell.Entry; import org.l2jmobius.gameserver.model.multisell.Ingredient; import org.l2jmobius.gameserver.model.multisell.PreparedListContainer; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; @@ -143,7 +144,7 @@ public class MultiSellChoose implements IClientIncomingPacket { if (!entry.isStackable() && (_amount > 1)) { - LOGGER.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell, id:" + _listId + ":" + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell, id:" + _listId + ":" + _entryId); player.setMultiSell(null); return; } @@ -265,7 +266,7 @@ public class MultiSellChoose implements IClientIncomingPacket Item itemToTake = inv.getItemByItemId(e.getItemId()); // initialize and initial guess for the item to take. if (itemToTake == null) { // this is a cheat, transaction will be aborted and if any items already taken will not be returned back to inventory! - LOGGER.severe("Character: " + player.getName() + " is trying to cheat in multisell, id:" + _listId + ":" + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to cheat in multisell, id:" + _listId + ":" + _entryId); player.setMultiSell(null); return; } 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 5559da01ab..0ab14c10e5 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 @@ -43,6 +43,7 @@ import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillDone; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillList; @@ -96,7 +97,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if ((_level < 1) || (_level > 1000) || (_id < 1) || (_id > 32000)) { Util.handleIllegalPlayerAction(player, "Wrong Packet Data in Aquired Skill", Config.DEFAULT_PUNISH); - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); return; } @@ -109,7 +110,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level); if (skill == null) { - LOGGER.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -312,7 +313,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket } else { - LOGGER.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 " + player.getName() + "!"); return; } } @@ -346,12 +347,12 @@ public class RequestAcquireSkill implements IClientIncomingPacket } else { - LOGGER.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 " + player.getName() + "!"); } } else { - LOGGER.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 " + player.getName() + "!"); } } } @@ -372,7 +373,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket } default: { - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); break; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 9aa5308894..ab8d3762f7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillInfo; /** @@ -52,7 +53,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket { if ((_id <= 0) || (_level <= 0)) { - LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); return; } @@ -71,7 +72,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level); if (skill == null) { - LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); + PacketLogger.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); return; } 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 9bfcfc47f2..4e38c70fbd 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 @@ -48,6 +48,7 @@ import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.NpcStringId; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ChairSit; @@ -128,7 +129,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().getId()); + PacketLogger.warning("Player " + 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/RequestAnswerFriendInvite.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerFriendInvite.java index 851f4b20ca..4fa42b1f5c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerFriendInvite.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAnswerFriendInvite.java @@ -18,12 +18,12 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.FriendPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -92,7 +92,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e); + PacketLogger.warning("Could not add friend objectid: " + e.getMessage()); } } else diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java index 56fac1841d..176538531e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; public class RequestBlock implements IClientIncomingPacket @@ -107,7 +108,7 @@ public class RequestBlock implements IClientIncomingPacket } default: { - LOGGER.info("Unknown 0xA9 block type: " + _type); + PacketLogger.info("Unknown 0xA9 block type: " + _type); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBrBuyProduct.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBrBuyProduct.java index 437880c790..c1755df94e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBrBuyProduct.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBrBuyProduct.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; @@ -29,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.PrimeShopProductHolder; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ExBrBuyProduct; import org.l2jmobius.gameserver.network.serverpackets.ExBrGamePoint; import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate; @@ -132,7 +132,7 @@ public class RequestBrBuyProduct implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Could not save Item Mall transaction: " + e.getMessage(), e); + PacketLogger.warning("Could not save Item Mall transaction: " + e.getMessage()); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index af6ea9e5e5..d880d8aae2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.buylist.BuyListHolder; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -178,7 +179,7 @@ public class RequestBuyItem implements IClientIncomingPacket if (price < 0) { - LOGGER.warning("ERROR, no price found .. wrong buylist ??"); + PacketLogger.warning("ERROR, no price found .. wrong buylist ??"); client.sendPacket(ActionFailed.STATIC_PACKET); 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 494f97d5e7..be91a8e528 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.StringTokenizer; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -38,6 +37,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -83,7 +83,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -180,7 +180,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (NumberFormatException nfe) { - LOGGER.log(Level.WARNING, "NFE for command [" + _command + "]", nfe); + PacketLogger.warning("NFE for command [" + _command + "] " + nfe.getMessage()); } } else if (_command.startsWith("_match")) @@ -252,13 +252,13 @@ public class RequestBypassToServer implements IClientIncomingPacket } else { - LOGGER.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); + PacketLogger.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); } } } catch (Exception e) { - LOGGER.log(Level.WARNING, "Exception processing bypass from player " + player.getName() + ": " + _command, e); + PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _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/RequestCrystallizeItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index d95eb25567..50edf85161 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -55,7 +56,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.fine("RequestCrystalizeItem: activeChar was null"); + // PacketLogger.finer("RequestCrystalizeItem: activeChar was null"); return; } @@ -84,7 +85,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - LOGGER.info("Player " + client + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info("Player " + client + " used crystalize with classid: " + player.getClassId().getId()); } return; } @@ -113,7 +114,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket if (!itemToRemove.getItem().isCrystallizable() || (itemToRemove.getItem().getCrystalCount() <= 0) || (itemToRemove.getItem().getCrystalType() == CrystalType.NONE)) { - LOGGER.warning(player.getName() + " (" + player.getObjectId() + ") tried to crystallize " + itemToRemove.getItem().getId()); + PacketLogger.warning(player.getName() + " (" + player.getObjectId() + ") tried to crystallize " + itemToRemove.getItem().getId()); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 5597f7200e..5839091933 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; @@ -29,6 +28,7 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; @@ -151,7 +151,7 @@ public class RequestDestroyItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not delete pet objectid: ", e); + PacketLogger.warning("Could not delete pet objectid: " + e.getMessage()); } } if (itemToRemove.isTimeLimitedItem()) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index dda1884b43..f051329a2a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; @@ -225,7 +226,7 @@ public class RequestDropItem implements IClientIncomingPacket if ((dropedItem != null) && (dropedItem.getId() == Inventory.ADENA_ID) && (dropedItem.getCount() >= 1000000)) { final String msg = "Character (" + player.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")"; - LOGGER.warning(msg); + PacketLogger.warning(msg); AdminData.getInstance().broadcastMessageToGMs(msg); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java index 30fb0b64e9..c3602b7366 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ExNeedToChangeName; /** @@ -42,6 +43,6 @@ public class RequestExChangeName implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("Recieved [C]RequestExChangeName name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); + PacketLogger.info("Recieved [C]RequestExChangeName name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java index 6e4861568e..c2f02f89ad 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chdd d: Arena d: Team @@ -74,7 +75,7 @@ public class RequestExCubeGameChangeTeam implements IClientIncomingPacket } default: { - LOGGER.warning("Wrong Cube Game Team ID: " + _team); + PacketLogger.warning("Wrong Cube Game Team ID: " + _team); break; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java index 009b836b6d..d72fdfc413 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chddd d: Arena d: Answer @@ -64,7 +65,7 @@ public class RequestExCubeGameReadyAnswer implements IClientIncomingPacket } default: { - LOGGER.warning("Unknown Cube Game Answer ID: " + _answer); + PacketLogger.warning("Unknown Cube Game Answer ID: " + _answer); break; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index f16bc64bfd..235a80e29c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; import org.l2jmobius.gameserver.util.Broadcast; @@ -86,7 +87,7 @@ public class RequestExMagicSkillUseGround implements IClientIncomingPacket else { player.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("No skill found with id " + _skillId + " and level " + level + " !!"); + PacketLogger.warning("No skill found with id " + _skillId + " and level " + level + " !!"); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 2d110363b9..95e26fa980 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Level; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; @@ -25,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; @@ -71,7 +70,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket player.sendPacket(new ExPutEnchantTargetItemResult(0)); if (scrollTemplate == null) { - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); + PacketLogger.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); } return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java index 05e09e6dfc..0a4522bf64 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressMapInfo; @@ -43,7 +44,7 @@ public class RequestFortressMapInfo implements IClientIncomingPacket final Fort fort = FortManager.getInstance().getFortById(_fortressId); if (fort == null) { - LOGGER.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); + PacketLogger.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); if (client.getPlayer() == null) { return; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestFriendDel.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestFriendDel.java index 83742d59ca..d074a71e8e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestFriendDel.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestFriendDel.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -26,6 +25,7 @@ import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.FriendPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -98,7 +98,7 @@ public class RequestFriendDel implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not del friend objectid: ", e); + PacketLogger.warning(getClass().getSimpleName() + ": Could not delele friend objectId: " + e.getMessage()); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java index 81b521f295..f0bdef4cf3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java @@ -22,6 +22,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.RaidBossPointsManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ExGetBossRecord; /** @@ -50,7 +51,7 @@ public class RequestGetBossRecord implements IClientIncomingPacket if (_bossId != 0) { - LOGGER.info("C5: RequestGetBossRecord: d: " + _bossId + " ActiveChar: " + player); // should be always 0, log it if isnt 0 for furture research + PacketLogger.info("C5: RequestGetBossRecord: d: " + _bossId + " ActiveChar: " + player); // should be always 0, log it if isnt 0 for furture research } final int points = RaidBossPointsManager.getInstance().getPointsByOwnerId(player.getObjectId()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index 02f1633c90..363b649cfc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.util.Util; /** @@ -78,7 +79,7 @@ public class RequestGetItemFromPet implements IClientIncomingPacket if (pet.transferItem("Transfer", _objectId, _amount, player.getInventory(), player, pet) == null) { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 20db5022d4..ed7ae07d03 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; @@ -117,7 +118,7 @@ public class RequestGiveItemToPet implements IClientIncomingPacket if (player.transferItem("Transfer", _objectId, _amount, pet.getInventory(), pet) == null) { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } 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 c7f51c1de5..78604ed9fd 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 @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -65,7 +66,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning(getClass().getName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); client.sendActionFailed(); return; } 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 6ff69e5355..66954debe1 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; /** @@ -51,7 +52,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - LOGGER.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); } client.sendActionFailed(); 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 60854d1a90..c5477ad459 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; /** @@ -49,7 +50,7 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning(getClass().getName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); client.sendActionFailed(); 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 44b26abac9..908f6a2813 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; /** @@ -74,7 +75,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); client.sendActionFailed(); } } 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 6e5ddb0942..c9f27ad24c 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 @@ -21,6 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -50,20 +51,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - LOGGER.warning("Player " + actor.getName() + " sent empty html link!"); + PacketLogger.warning("Player " + actor.getName() + " sent empty html link!"); return; } if (_link.contains("..")) { - LOGGER.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); return; } final int htmlObjectId = actor.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - LOGGER.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 2a31191bcb..2b9edcb0ea 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListDelete; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -72,7 +73,7 @@ public class RequestOustPledgeMember implements IClientIncomingPacket final ClanMember member = clan.getClanMember(_target); if (member == null) { - LOGGER.warning("Target (" + _target + ") is not member of the clan"); + PacketLogger.warning("Target (" + _target + ") is not member of the clan"); return; } if (member.isOnline() && member.getPlayer().isInCombat()) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java index 9702554c3b..209835b319 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) S @@ -37,6 +38,6 @@ public class RequestPCCafeCouponUse implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestPCCafeCouponUse: S: " + _str); + PacketLogger.info("C5: RequestPCCafeCouponUse: S: " + _str); } } 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 5c9f93f74d..d6075cb0ea 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 @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Level; - import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; @@ -29,6 +27,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; @@ -124,7 +123,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item item = player.checkItemManipulation(i.getId(), i.getCount(), "freight"); if (item == null) { - LOGGER.log(Level.WARNING, "Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); warehouse.deleteMe(); return; } @@ -173,7 +172,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { - LOGGER.log(Level.WARNING, "Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); warehouse.deleteMe(); return; } @@ -181,7 +180,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem("Trade", i.getId(), i.getCount(), warehouse, player, null); if (newItem == null) { - LOGGER.log(Level.WARNING, "Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java index fdc9f54210..fa76806f55 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java @@ -64,7 +64,7 @@ public class RequestPartyMatchList implements IClientIncomingPacket final PartyMatchRoom room = PartyMatchRoomList.getInstance().getRoom(_roomid); if (room != null) { - LOGGER.info("PartyMatchRoom #" + room.getId() + " changed by " + player.getName()); + // PacketLogger.info("PartyMatchRoom #" + room.getId() + " changed by " + player.getName()); room.setMaxMembers(_membersmax); room.setMinLevel(_minLevel); room.setMaxLevel(_maxLevel); @@ -88,7 +88,7 @@ public class RequestPartyMatchList implements IClientIncomingPacket final int maxid = PartyMatchRoomList.getInstance().getMaxId(); final PartyMatchRoom room = new PartyMatchRoom(maxid, _roomtitle, _loot, _minLevel, _maxLevel, _membersmax, player); - LOGGER.info("PartyMatchRoom #" + maxid + " created by " + player.getName()); + // PacketLogger.info("PartyMatchRoom #" + maxid + " created by " + player.getName()); // Remove from waiting list PartyMatchWaitingList.getInstance().removePlayer(player); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 61715121bc..24fbf0eb78 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -136,7 +137,7 @@ public class RequestPetUseItem implements IClientIncomingPacket else { player.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM); - LOGGER.warning("No item handler registered for itemId: " + item.getId()); + PacketLogger.warning("No item handler registered for itemId: " + item.getId()); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index 2a4363230f..af09102efa 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -19,13 +19,13 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Plim @@ -74,7 +74,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket } catch (SQLException e) { - LOGGER.log(Level.SEVERE, "Error while saving petition feedback"); + PacketLogger.warning(getClass().getSimpleName() + ": Error while saving petition feedback: " + e.getMessage()); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java index fc3386625e..8c5e2ee3d9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java @@ -44,8 +44,8 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket @Override public void run(GameClient client) { - // LOGGER.info("C5: RequestPledgeMemberInfo d:"+_unk1); - // LOGGER.info("C5: RequestPledgeMemberInfo S:"+_player); + // PacketLogger.info("C5: RequestPledgeMemberInfo d:"+_unk1); + // PacketLogger.info("C5: RequestPledgeMemberInfo S:"+_player); final Player player = client.getPlayer(); if (player == null) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index df9f52bac1..d16cb82368 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.HashMap; import java.util.Map; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -37,6 +36,7 @@ import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ShopPreviewInfo; @@ -73,7 +73,7 @@ public class RequestPreviewItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } @@ -151,7 +151,7 @@ public class RequestPreviewItem implements IClientIncomingPacket final Merchant merchant = (target instanceof Merchant) ? (Merchant) target : null; if (merchant == null) { - LOGGER.warning(getClass().getName() + " Null merchant!"); + PacketLogger.warning(getClass().getName() + ": Null merchant!"); 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 5ce6e3980e..2b28f271af 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.util.Util; @@ -141,7 +142,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if (result > 1) { - LOGGER.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); } return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java index e3b6bd2d41..024db347c5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; /** @@ -131,7 +132,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket if (!storeList.privateStoreSell(player, _items)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index 219ebf1ce2..31374e04ae 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.buylist.BuyListHolder; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -194,7 +195,7 @@ public class RequestRefundItem implements IClientIncomingPacket final Item item = player.getRefund().transferItem("Refund", objectIds[i], Long.MAX_VALUE, player.getInventory(), player, player.getLastFolkNPC()); if (item == null) { - LOGGER.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index ee78579ea4..8a2f42272a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket { @@ -54,7 +55,7 @@ public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket } else { - LOGGER.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); + PacketLogger.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); } player.onTransactionRequest(requestor); } 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 439d9e7ef2..a6b076f572 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 @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.sevensigns.SevenSignsFestival; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -70,7 +71,7 @@ public class RequestRestart implements IClientIncomingPacket if (player.isLocked()) { - LOGGER.warning("Player " + player.getName() + " tried to restart during class change."); + PacketLogger.warning("Player " + player.getName() + " tried to restart during class change."); client.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/RequestRestartPoint.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index 6409d8b57b..63f2fff99e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.clanhalls.SiegableHall; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @version $Revision: 1.7.2.3.2.6 $ $Date: 2005/03/27 15:29:30 $ @@ -145,7 +146,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if ((player.getClan() == null) || (player.getClan().getHideoutId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.CLANHALL); @@ -171,7 +172,7 @@ public class RequestRestartPoint implements IClientIncomingPacket } else { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); return; } } @@ -193,7 +194,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if (((player.getClan() == null) || (player.getClan().getFortId() == 0)) && !isInDefense) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.FORTRESS); @@ -234,7 +235,7 @@ public class RequestRestartPoint implements IClientIncomingPacket } } - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.SIEGEFLAG); @@ -244,7 +245,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if (!player.isGM() && !player.isFestivalParticipant() && !player.getInventory().haveItemForSelfResurrection()) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); return; } if (player.isGM() || player.destroyItemByItemId("Feather", 10649, 1, player, false) || player.destroyItemByItemId("Feather", 13300, 1, player, false) || player.destroyItemByItemId("Feather", 13128, 1, player, false)) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 26f568f261..330bcfd5a5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExNoticePostSent; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -313,14 +314,14 @@ public class RequestSendPost implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getObjectId(), i.getCount(), "attach"); if ((oldItem == null) || !oldItem.isTradeable() || oldItem.isEquipped()) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); return false; } final Item newItem = player.getInventory().transferItem("SendMail", i.getObjectId(), i.getCount(), attachments, player, receiver); if (newItem == null) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java index 3831e83440..5ae43534f0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.Calendar; import java.util.Date; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -26,6 +25,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -55,17 +55,17 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket final Castle castle = CastleManager.getInstance().getCastleById(_castleId); if ((player == null) || (castle == null)) { - LOGGER.log(Level.WARNING, "[C]RequestSetCastleSiegeTime: activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); + PacketLogger.warning("[C]RequestSetCastleSiegeTime: activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); return; } if ((castle.getOwnerId() > 0) && (castle.getOwnerId() != player.getClanId())) { - LOGGER.log(Level.WARNING, "[C]RequestSetCastleSiegeTime: activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); + PacketLogger.warning("[C]RequestSetCastleSiegeTime: activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); } else if (!player.isClanLeader()) { - LOGGER.log(Level.WARNING, "[C]RequestSetCastleSiegeTime: activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); + PacketLogger.warning("[C]RequestSetCastleSiegeTime: activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); } else if (!castle.isTimeRegistrationOver()) { @@ -81,12 +81,12 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket } else { - LOGGER.log(Level.WARNING, "[C]RequestSetCastleSiegeTime: activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); + PacketLogger.warning("[C]RequestSetCastleSiegeTime: activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); } } else { - LOGGER.log(Level.WARNING, "[C]RequestSetCastleSiegeTime: activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); + PacketLogger.warning("[C]RequestSetCastleSiegeTime: activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java index e1adec4dbb..204484db56 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -57,7 +58,7 @@ public class RequestSurrenderPledgeWar implements IClientIncomingPacket return; } - LOGGER.info("RequestSurrenderPledgeWar by " + client.getPlayer().getClan().getName() + " with " + _pledgeName); + PacketLogger.info("RequestSurrenderPledgeWar by " + client.getPlayer().getClan().getName() + " with " + _pledgeName); if (!playerClan.isAtWarWith(clan.getId())) { player.sendMessage("You aren't at war with this clan."); 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 352d88f71a..a3a3d850c2 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 @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.events.returns.ChatFilterReturn; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; @@ -109,7 +110,7 @@ public class Say2 implements IClientIncomingPacket ChatType chatType = ChatType.findByClientId(_type); if (chatType == null) { - LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); + PacketLogger.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -117,7 +118,7 @@ public class Say2 implements IClientIncomingPacket if (_text.isEmpty()) { - LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); + PacketLogger.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -204,7 +205,7 @@ public class Say2 implements IClientIncomingPacket } else { - LOGGER.info("No handler registered for ChatType: " + _type + " Player: " + client); + PacketLogger.info("No handler registered for ChatType: " + _type + " Player: " + client); } } @@ -252,7 +253,7 @@ public class Say2 implements IClientIncomingPacket { if (owner.getInventory().getItemByObjectId(id) == null) { - LOGGER.info(owner.getClient() + " trying publish item which doesnt own! ID:" + id); + PacketLogger.info(owner.getClient() + " trying publish item which doesnt own! ID:" + id); return false; } ((Item) item).publish(); @@ -264,7 +265,7 @@ public class Say2 implements IClientIncomingPacket pos1 = _text.indexOf(8, pos) + 1; if (pos1 == 0) // missing ending tag { - LOGGER.info(owner.getClient() + " sent invalid publish item msg! ID:" + id); + PacketLogger.info(owner.getClient() + " sent invalid publish item msg! ID:" + id); return false; } } 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 249e5d95a7..608a8e9c1b 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 @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; @@ -129,7 +130,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item item = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); return; } @@ -176,7 +177,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } @@ -188,7 +189,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem(warehouse.getName(), itemHolder.getId(), itemHolder.getCount(), warehouse, player, manager); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index b1af21fc5c..1fb4492d77 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; @@ -170,13 +171,13 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket final Item oldItem = warehouse.getItemByObjectId(i.getId()); if ((oldItem == null) || (oldItem.getCount() < i.getCount())) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } final Item newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, manager); if (newItem == null) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 8e6e8008f9..2f44afd3a4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.concurrent.TimeUnit; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -44,6 +43,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUseSharedGroupItem; @@ -330,7 +330,7 @@ public class UseItem implements IClientIncomingPacket { if ((etcItem != null) && (etcItem.getHandlerName() != null)) { - LOGGER.log(Level.WARNING, "Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); + PacketLogger.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); } return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 33eeff5060..1b8ddb2042 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -16,11 +16,10 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Level; - import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.util.Util; /** @@ -75,7 +74,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { if (html.length() > 17200) { - LOGGER.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable()); + PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } @@ -94,7 +93,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket if (content == null) { setHtml("My Text is missing:
" + path + ""); - LOGGER.warning("missing html page " + path); + PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrRecentProductList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrRecentProductList.java index fb5d7ea7a9..9bbd39371e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrRecentProductList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrRecentProductList.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.ArrayList; import java.util.List; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; @@ -29,6 +28,7 @@ import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.PrimeShopProductHolder; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Mobius @@ -59,7 +59,7 @@ public class ExBrRecentProductList implements IClientOutgoingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Could not restore Item Mall transaction: " + e.getMessage(), e); + PacketLogger.warning("Could not restore Item Mall transaction: " + e.getMessage()); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index 71463c91a1..f54fc2e0d7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Migi, DS @@ -44,7 +45,7 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index a7b9a38b52..9d03163f8c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * ExReplySentPost packet implementation. @@ -45,7 +46,7 @@ public class ExReplySentPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index 1164c4182f..1a110025a6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author KenM @@ -46,7 +47,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); + PacketLogger.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); packet.writeS(""); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index 63f368277f..9d3bb66b00 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IOutgoingPacket; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -27,8 +25,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; */ public interface IClientOutgoingPacket extends IOutgoingPacket { - Logger LOGGER = Logger.getLogger(IClientOutgoingPacket.class.getName()); - int[] PAPERDOLL_ORDER = new int[] { Inventory.PAPERDOLL_UNDER, diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 96885d69b1..a997d41772 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan.SubPledge; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author -Wooden- @@ -60,7 +61,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket } else if (_clan.getClanMember(LeaderId) == null) { - LOGGER.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); + PacketLogger.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); return ""; } else diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index 2becbf0fff..37f018ccd3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.RecipeData; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class RecipeItemMakeInfo implements IClientOutgoingPacket { @@ -57,7 +58,7 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket } else { - LOGGER.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); + PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); } return true; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 679ec50ba0..62cceeee49 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Shows the Siege Info
@@ -86,7 +87,7 @@ public class SiegeInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Null owner for castle: " + _castle.getName()); + PacketLogger.warning("Null owner for castle: " + _castle.getName()); } } else @@ -137,7 +138,7 @@ public class SiegeInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Null owner for siegable hall: " + _hall.getName()); + PacketLogger.warning("Null owner for siegable hall: " + _hall.getName()); } } else diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java index 1515ad1464..fb2524ddfc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.item.type.MaterialType; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket { @@ -94,7 +95,7 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket if (player.getActiveWarehouse() == null) { // Something went wrong! - LOGGER.warning("error while sending withdraw request to: " + player.getName()); + PacketLogger.warning("Error while sending withdraw request to: " + player.getName()); return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index d12dac12e6..b79840ec01 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Arrays; -import java.util.logging.Level; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.ItemTable; @@ -29,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; @@ -148,7 +148,7 @@ public class SystemMessage implements IClientOutgoingPacket { _params = Arrays.copyOf(_params, _paramIndex + 1); _smId.setParamCount(_paramIndex + 1); - LOGGER.log(Level.INFO, "Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); + PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } _params[_paramIndex++] = param; @@ -370,7 +370,7 @@ public class SystemMessage implements IClientOutgoingPacket { if (param == null) { - LOGGER.warning("Found null parameter for SystemMessageId " + _smId); + PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 8b6e77c083..d14f887846 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -22,6 +22,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class WareHouseWithdrawalList extends AbstractItemPacket { @@ -45,7 +46,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket { if (player.getActiveWarehouse() == null) { - LOGGER.warning("error while sending withdraw request to: " + player.getName()); + PacketLogger.warning("Error while sending withdraw request to: " + player.getName()); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/PacketLogger.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/PacketLogger.java new file mode 100644 index 0000000000..5b5a083a99 --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/PacketLogger.java @@ -0,0 +1,42 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.network; + +import java.util.logging.Logger; + +/** + * @author Mobius + */ +public class PacketLogger +{ + private static final Logger LOGGER = Logger.getLogger(PacketLogger.class.getName()); + + public static synchronized void warning(String message) + { + LOGGER.warning(message); + } + + public static synchronized void info(String message) + { + LOGGER.info(message); + } + + public static synchronized void finer(String message) + { + LOGGER.finer(message); + } +} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 7c343f78be..ef3f4acc18 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -161,7 +162,7 @@ public class Action implements IClientIncomingPacket default: { // Invalid action detected (probably client cheating), log this - LOGGER.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); + PacketLogger.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); client.sendPacket(ActionFailed.STATIC_PACKET); break; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index db177c478d..922a088a0b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; import org.l2jmobius.gameserver.network.serverpackets.TradeOwnAdd; @@ -57,7 +58,7 @@ public class AddTradeItem implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - LOGGER.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); + PacketLogger.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); return; } @@ -67,7 +68,7 @@ public class AddTradeItem implements IClientIncomingPacket // Trade partner not found, cancel trade if (partner != null) { - LOGGER.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); + PacketLogger.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); } player.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE); player.cancelActiveTrade(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 20134dd2bb..a3236b0d83 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -62,7 +62,7 @@ public class CannotMoveAnymore implements IClientIncomingPacket // player.stopMove(); // // if (Config.DEBUG) - // LOGGER.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ + // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); // StopMove smwl = new StopMove(player); // client.getPlayer().sendPacket(smwl); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index e25524223a..0b6571d963 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -43,6 +43,7 @@ import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; import org.l2jmobius.gameserver.network.serverpackets.CharCreateOk; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -124,21 +125,21 @@ public class CharacterCreate implements IClientIncomingPacket if ((_face > 2) || (_face < 0)) { - LOGGER.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairStyle < 0) || ((_sex == 0) && (_hairStyle > 4)) || ((_sex != 0) && (_hairStyle > 6))) { - LOGGER.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairColor > 3) || (_hairColor < 0)) { - LOGGER.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } @@ -303,7 +304,7 @@ public class CharacterCreate implements IClientIncomingPacket final Item item = newChar.getInventory().addItem("Init", ie.getId(), ie.getCount(), newChar, null); if (item == null) { - LOGGER.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); + PacketLogger.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); continue; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java index 86c425fa45..63c3261946 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Level; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.CharacterDeleteFailType; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -25,6 +23,7 @@ import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDelete; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteFail; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteSuccess; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -74,7 +73,7 @@ public class CharacterDelete implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Error:", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1, 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java index 5f74c38273..cfe9b20f3d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java @@ -47,7 +47,7 @@ public class EndScenePlayer implements IClientIncomingPacket final MovieHolder holder = player.getMovieHolder(); if ((holder == null) || (holder.getMovie().getClientId() != _movieId)) { - // LOGGER.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); + // PacketLogger.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 369bc20c4e..eadad51b74 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -67,6 +67,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.Die; @@ -151,7 +152,7 @@ public class EnterWorld implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.warning("EnterWorld failed! player returned 'null'."); + PacketLogger.warning("EnterWorld failed! player returned 'null'."); Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java index 8bde20da0a..14e8153478 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java @@ -25,9 +25,13 @@ import org.l2jmobius.gameserver.network.GameClient; */ public class ExGetOnAirShip implements IClientIncomingPacket { + @SuppressWarnings("unused") private int _x; + @SuppressWarnings("unused") private int _y; + @SuppressWarnings("unused") private int _z; + @SuppressWarnings("unused") private int _shipId; @Override @@ -43,9 +47,9 @@ public class ExGetOnAirShip implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("[T1:ExGetOnAirShip] x: " + _x); - LOGGER.info("[T1:ExGetOnAirShip] y: " + _y); - LOGGER.info("[T1:ExGetOnAirShip] z: " + _z); - LOGGER.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); + // PacketLogger.info("[T1:ExGetOnAirShip] x: " + _x); + // PacketLogger.info("[T1:ExGetOnAirShip] y: " + _y); + // PacketLogger.info("[T1:ExGetOnAirShip] z: " + _z); + // PacketLogger.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java index fcdd8335f4..4e91188f5c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java @@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Arrays; -import java.util.logging.Level; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: c dddd @@ -79,7 +79,7 @@ public class GameGuardReply implements IClientIncomingPacket } catch (NoSuchAlgorithmException e) { - LOGGER.log(Level.WARNING, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java index eddff9f891..62e69acd86 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.gameserver.network.GameClient; @@ -27,5 +25,4 @@ import org.l2jmobius.gameserver.network.GameClient; */ public interface IClientIncomingPacket extends IIncomingPacket { - Logger LOGGER = Logger.getLogger(IClientIncomingPacket.class.getName()); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index ea86074f0e..91a2b46047 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -153,7 +154,7 @@ public class MultiSellChoose implements IClientIncomingPacket if (((_soulCrystalOptions != null) && CommonUtil.contains(_soulCrystalOptions, null)) || ((_soulCrystalSpecialOptions != null) && CommonUtil.contains(_soulCrystalSpecialOptions, null))) { - LOGGER.severe("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -161,14 +162,14 @@ public class MultiSellChoose implements IClientIncomingPacket final MultisellEntryHolder entry = list.getEntries().get(_entryId - 1); // Entry Id begins from 1. We currently use entry IDs as index pointer. if (entry == null) { - LOGGER.severe("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } if (!entry.isStackable() && (_amount > 1)) { - LOGGER.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -196,7 +197,7 @@ public class MultiSellChoose implements IClientIncomingPacket )) //@formatter:on { - LOGGER.severe("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -368,7 +369,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); return; } } @@ -478,7 +479,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); return; } } @@ -673,7 +674,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); + PacketLogger.warning("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); return false; } } 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 b7b93ee7db..45cab77cbf 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 @@ -45,6 +45,7 @@ import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillDone; import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; @@ -105,7 +106,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if ((_level < 1) || (_level > 1000) || (_id < 1) || (_id > 64000)) { Util.handleIllegalPlayerAction(player, "Wrong Packet Data in Aquired Skill", Config.DEFAULT_PUNISH); - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); return; } @@ -119,7 +120,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - LOGGER.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -498,7 +499,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket } default: { - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); break; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 0a570fd3ef..4bb789645a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillInfo; import org.l2jmobius.gameserver.network.serverpackets.ExAcquireSkillInfo; @@ -55,7 +56,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket { if ((_id <= 0) || (_level <= 0)) { - LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); return; } @@ -74,7 +75,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level); if (skill == null) { - LOGGER.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); + PacketLogger.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); return; } 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 5e0a2af0c9..8078d0c10e 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.Arrays; -import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.ActionData; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; @@ -41,8 +41,6 @@ import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList; */ public class RequestActionUse implements IClientIncomingPacket { - private static final Logger LOGGER = Logger.getLogger(RequestActionUse.class.getName()); - private int _actionId; private boolean _ctrlPressed; private boolean _shiftPressed; @@ -93,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } @@ -107,7 +105,7 @@ public class RequestActionUse implements IClientIncomingPacket actionHandler.useAction(player, actionHolder, _ctrlPressed, _shiftPressed); return; } - LOGGER.warning("Couldnt find handler with name: " + actionHolder.getHandler()); + PacketLogger.warning("Couldn't find handler with name: " + actionHolder.getHandler()); return; } @@ -143,7 +141,7 @@ public class RequestActionUse implements IClientIncomingPacket } default: { - LOGGER.warning(player.getName() + ": unhandled action type " + _actionId); + PacketLogger.warning(player.getName() + ": unhandled action type " + _actionId); break; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java index 1fa1214bea..76649875f1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.data.xml.FakePlayerData; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -130,7 +131,7 @@ public class RequestBlock implements IClientIncomingPacket } default: { - LOGGER.info("Unknown 0xA9 block type: " + _type); + PacketLogger.info("Unknown 0xA9 block type: " + _type); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index eb7e62ebf2..ce3d851f06 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -161,7 +162,7 @@ public class RequestBuyItem implements IClientIncomingPacket long price = product.getPrice(); if (price < 0) { - LOGGER.warning("ERROR, no price found .. wrong buylist ??"); + PacketLogger.warning("ERROR, no price found .. wrong buylist ??"); client.sendPacket(ActionFailed.STATIC_PACKET); 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 a7e3f28ed6..dd5c90fce2 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.StringTokenizer; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -41,6 +40,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -88,7 +88,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -192,7 +192,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (NumberFormatException nfe) { - LOGGER.log(Level.WARNING, "NFE for command [" + _command + "]", nfe); + PacketLogger.warning("NFE for command [" + _command + "] " + nfe.getMessage()); } } else if (_command.startsWith("_match")) @@ -284,13 +284,13 @@ public class RequestBypassToServer implements IClientIncomingPacket } else { - LOGGER.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); + PacketLogger.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); } } } catch (Exception e) { - LOGGER.log(Level.WARNING, "Exception processing bypass from player " + player.getName() + ": " + _command, e); + PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _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/RequestCrystallizeItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index af45d9defb..03d610fe78 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -59,7 +60,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.finer("RequestCrystalizeItem: activeChar was null"); + // PacketLogger.finer("RequestCrystalizeItem: activeChar was null."); return; } @@ -87,7 +88,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - LOGGER.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index c67449efed..71bb657bf9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; @@ -33,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -169,7 +169,7 @@ public class RequestDestroyItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not delete pet objectid: ", e); + PacketLogger.warning("Could not delete pet objectid: " + e.getMessage()); } } if (itemToRemove.isTimeLimitedItem()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 35f1f3c33e..5b6fea109a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.GMAudit; import org.l2jmobius.gameserver.util.Util; @@ -210,7 +211,7 @@ public class RequestDropItem implements IClientIncomingPacket if ((dropedItem != null) && (dropedItem.getId() == Inventory.ADENA_ID) && (dropedItem.getCount() >= 1000000)) { final String msg = "Character (" + player.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")"; - LOGGER.warning(msg); + PacketLogger.warning(msg); AdminData.getInstance().broadcastMessageToGMs(msg); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java index e3ab837779..e8bfc249c9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ExNeedToChangeName; /** @@ -42,6 +43,6 @@ public class RequestExChangeName implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); + PacketLogger.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java index 6e4861568e..c2f02f89ad 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chdd d: Arena d: Team @@ -74,7 +75,7 @@ public class RequestExCubeGameChangeTeam implements IClientIncomingPacket } default: { - LOGGER.warning("Wrong Cube Game Team ID: " + _team); + PacketLogger.warning("Wrong Cube Game Team ID: " + _team); break; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java index 009b836b6d..d72fdfc413 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chddd d: Arena d: Answer @@ -64,7 +65,7 @@ public class RequestExCubeGameReadyAnswer implements IClientIncomingPacket } default: { - LOGGER.warning("Unknown Cube Game Answer ID: " + _answer); + PacketLogger.warning("Unknown Cube Game Answer ID: " + _answer); break; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java index ff12adb20d..3347f01941 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) just a trigger @@ -34,6 +35,6 @@ public class RequestExFishRanking implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestExFishRanking"); + PacketLogger.info("C5: RequestExFishRanking"); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 57e8e7d2e5..8851aef463 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; import org.l2jmobius.gameserver.util.Broadcast; @@ -86,7 +87,7 @@ public class RequestExMagicSkillUseGround implements IClientIncomingPacket else { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("No skill found with id " + _skillId + " and level " + level + " !!"); + PacketLogger.warning("No skill found with id " + _skillId + " and level " + level + " !!"); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 77093c5f2d..2d9f0456f4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; @@ -73,7 +74,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket client.sendPacket(new ExPutEnchantTargetItemResult(0)); if (scrollTemplate == null) { - LOGGER.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); + PacketLogger.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); } return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java index 05e09e6dfc..0a4522bf64 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressMapInfo; @@ -43,7 +44,7 @@ public class RequestFortressMapInfo implements IClientIncomingPacket final Fort fort = FortManager.getInstance().getFortById(_fortressId); if (fort == null) { - LOGGER.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); + PacketLogger.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); if (client.getPlayer() == null) { 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 f65a63d325..dc903790d0 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 @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) d @@ -44,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - LOGGER.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning("Player " + 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/RequestGetItemFromPet.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index 2330851024..fc913f182b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.util.Util; /** @@ -78,7 +79,7 @@ public class RequestGetItemFromPet implements IClientIncomingPacket if (pet.transferItem("Transfer", _objectId, _amount, player.getInventory(), player, pet) == null) { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 66fb839f0e..81d0ee6d55 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; @@ -118,7 +119,7 @@ public class RequestGiveItemToPet implements IClientIncomingPacket if (player.transferItem("Transfer", _objectId, _amount, pet.getInventory(), pet) == null) { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } 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 d0add3fa49..04abcbce46 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 @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaEquipList; @@ -67,7 +68,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.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 fa21b68043..a7c019d65d 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; @@ -52,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - LOGGER.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); } client.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 b943775334..ff96a400c9 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; @@ -50,10 +51,11 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.sendPacket(ActionFailed.STATIC_PACKET); return; } + player.sendPacket(new HennaItemRemoveInfo(henna, player)); } } 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 ab9f0c33f7..89e11ba6a9 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -75,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); client.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 53f04488a6..ada67e190c 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -49,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - LOGGER.warning("Player " + actor.getName() + " sent empty html link!"); + PacketLogger.warning("Player " + actor.getName() + " sent empty html link!"); return; } if (_link.contains("..")) { - LOGGER.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); return; } final int htmlObjectId = actor.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - LOGGER.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java index 89adeae67b..2e1c1c83f6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author UnAfraid @@ -51,7 +52,7 @@ public class RequestMagicSkillList implements IClientIncomingPacket if (player.getObjectId() != _objectId) { - LOGGER.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); + PacketLogger.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 9432941937..a228079092 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -64,7 +64,7 @@ public class RequestMagicSkillUse implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); // if (_magicId > 0) // { - // LOGGER.warning("Skill Id " + _magicId + " not found in player: " + player); + // PacketLogger.warning("Skill Id " + _magicId + " not found in player: " + player); // } return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 5fbcac0eca..9149ce1284 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListDelete; @@ -71,7 +72,7 @@ public class RequestOustPledgeMember implements IClientIncomingPacket final ClanMember member = clan.getClanMember(_target); if (member == null) { - LOGGER.warning("Target (" + _target + ") is not member of the clan"); + PacketLogger.warning("Target (" + _target + ") is not member of the clan"); return; } if (member.isOnline() && member.getPlayer().isInCombat()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java index 9702554c3b..209835b319 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) S @@ -37,6 +38,6 @@ public class RequestPCCafeCouponUse implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestPCCafeCouponUse: S: " + _str); + PacketLogger.info("C5: RequestPCCafeCouponUse: S: " + _str); } } 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 e4376f9ad5..14eb0ff29b 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 @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -120,7 +121,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item item = player.checkItemManipulation(i.getId(), i.getCount(), "freight"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); warehouse.deleteMe(); return; } @@ -169,7 +170,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); warehouse.deleteMe(); return; } @@ -177,7 +178,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem("Trade", i.getId(), i.getCount(), warehouse, player, null); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 26cfaf9835..d8b2285a2d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -136,7 +137,7 @@ public class RequestPetUseItem implements IClientIncomingPacket else { player.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM); - LOGGER.warning("No item handler registered for itemId: " + item.getId()); + PacketLogger.warning("No item handler registered for itemId: " + item.getId()); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index 8ece2b3ec7..fec0dc36a0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -25,6 +25,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Plim @@ -74,7 +75,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket } catch (SQLException e) { - LOGGER.severe("Error while saving petition feedback"); + PacketLogger.warning("Error while saving petition feedback."); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java index d212481717..3459b04c80 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java @@ -44,8 +44,8 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket @Override public void run(GameClient client) { - // LOGGER.info("C5: RequestPledgeMemberInfo d:"+_unk1); - // LOGGER.info("C5: RequestPledgeMemberInfo S:"+_player); + // PacketLogger.info("C5: RequestPledgeMemberInfo d:"+_unk1); + // PacketLogger.info("C5: RequestPledgeMemberInfo S:"+_player); final Player player = client.getPlayer(); if (player == null) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index e56c105cf4..44bbd9d34c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.HashMap; import java.util.Map; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -38,6 +37,7 @@ import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; @@ -74,7 +74,7 @@ public class RequestPreviewItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } @@ -152,7 +152,7 @@ public class RequestPreviewItem implements IClientIncomingPacket final Merchant merchant = (target instanceof Merchant) ? (Merchant) target : null; if (merchant == null) { - LOGGER.warning("Null merchant!"); + PacketLogger.warning(getClass().getSimpleName() + ": Null merchant!"); 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 251757c0ba..94958bc4fe 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.util.Util; @@ -145,7 +146,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if (result > 1) { - LOGGER.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); } return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java index 9998465898..8ab3d4962f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; public class RequestPrivateStoreSell implements IClientIncomingPacket @@ -134,7 +135,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket if (!storeList.privateStoreSell(player, _items)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index a4010ca2cb..1632df189f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -193,7 +194,7 @@ public class RequestRefundItem implements IClientIncomingPacket final Item item = player.getRefund().transferItem("Refund", objectIds[i], Long.MAX_VALUE, player.getInventory(), player, player.getLastFolkNPC()); if (item == null) { - LOGGER.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index ee78579ea4..8a2f42272a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket { @@ -54,7 +55,7 @@ public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket } else { - LOGGER.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); + PacketLogger.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); } player.onTransactionRequest(requestor); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index afc4e65df4..08ad2c7763 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @version $Revision: 1.7.2.3.2.6 $ $Date: 2005/03/27 15:29:30 $ @@ -139,7 +140,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if ((player.getClan() == null) || (player.getClan().getHideoutId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.CLANHALL); @@ -167,7 +168,7 @@ public class RequestRestartPoint implements IClientIncomingPacket } else { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); return; } } @@ -199,7 +200,7 @@ public class RequestRestartPoint implements IClientIncomingPacket final Clan clan = player.getClan(); if ((clan == null) || (clan.getFortId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.FORTRESS); @@ -231,7 +232,7 @@ public class RequestRestartPoint implements IClientIncomingPacket if (((siegeClan == null) || siegeClan.getFlag().isEmpty())) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.SIEGEFLAG); @@ -241,7 +242,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if (!player.isGM() && !player.getInventory().haveItemForSelfResurrection()) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); return; } if (player.isGM() || player.destroyItemByItemId("Feather", 10649, 1, player, false) || player.destroyItemByItemId("Feather", 13300, 1, player, false) || player.destroyItemByItemId("Feather", 13128, 1, player, false)) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 33a10fd20c..5014c0b7d0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExNoticePostSent; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -316,14 +317,14 @@ public class RequestSendPost implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getObjectId(), i.getCount(), "attach"); if ((oldItem == null) || !oldItem.isTradeable() || oldItem.isEquipped()) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); return false; } final Item newItem = player.getInventory().transferItem("SendMail", i.getObjectId(), i.getCount(), attachments, player, msg.getReceiverName() + "[" + msg.getReceiverId() + "]"); if (newItem == null) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java index 2a33016c9a..b5d130046c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -54,16 +55,16 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket final Castle castle = CastleManager.getInstance().getCastleById(_castleId); if ((player == null) || (castle == null)) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); return; } if ((castle.getOwnerId() > 0) && (castle.getOwnerId() != player.getClanId())) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); } else if (!player.isClanLeader()) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); } else if (!castle.isTimeRegistrationOver()) { @@ -79,12 +80,12 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); } } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); } } 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 6d1eea218a..c600906d81 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 @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; @@ -108,7 +109,7 @@ public class Say2 implements IClientIncomingPacket ChatType chatType = ChatType.findByClientId(_type); if (chatType == null) { - LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); + PacketLogger.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -116,7 +117,7 @@ public class Say2 implements IClientIncomingPacket if (_text.isEmpty()) { - LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); + PacketLogger.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -210,7 +211,7 @@ public class Say2 implements IClientIncomingPacket } else { - LOGGER.info("No handler registered for ChatType: " + _type + " Player: " + client); + PacketLogger.info("No handler registered for ChatType: " + _type + " Player: " + client); } } @@ -256,7 +257,7 @@ public class Say2 implements IClientIncomingPacket final Item item = owner.getInventory().getItemByObjectId(id); if (item == null) { - LOGGER.info(client + " trying publish item which doesnt own! ID:" + id); + PacketLogger.info(client + " trying publish item which doesnt own! ID:" + id); return false; } item.publish(); @@ -264,7 +265,7 @@ public class Say2 implements IClientIncomingPacket pos1 = _text.indexOf(8, pos) + 1; if (pos1 == 0) // missing ending tag { - LOGGER.info(client + " sent invalid publish item msg! ID:" + id); + PacketLogger.info(client + " sent invalid publish item msg! ID:" + id); return false; } } 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 ee93527570..7cdde1c7bb 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 @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -127,7 +128,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item item = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); return; } @@ -174,7 +175,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } @@ -186,7 +187,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem(warehouse.getName(), itemHolder.getId(), itemHolder.getCount(), warehouse, player, manager); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 3de872e222..54b59f3ea5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; @@ -163,13 +164,13 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket final Item oldItem = warehouse.getItemByObjectId(i.getId()); if ((oldItem == null) || (oldItem.getCount() < i.getCount())) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } final Item newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, manager); if (newItem == null) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); return; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index b42c56a13c..cd4f0c7c64 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -43,6 +43,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUseSharedGroupItem; @@ -274,7 +275,7 @@ public class UseItem implements IClientIncomingPacket { if ((etcItem != null) && (etcItem.getHandlerName() != null)) { - LOGGER.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); + PacketLogger.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); } } else if (handler.useItem(player, item, _ctrlPressed)) 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 20d84a2bd6..6b2f96e87d 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; @@ -60,37 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - LOGGER.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 30% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 100% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - LOGGER.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - - LOGGER.warning("Player " + player + ": Auction House (15-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); return; - } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - LOGGER.warning("Player " + player + ": Auction House (30-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + 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/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index b4b5bd9011..e4e46a5271 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -94,7 +95,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning(player + ": tried to crystallize " + item.getItem()); + PacketLogger.warning(player + ": tried to crystallize " + item.getItem()); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index 8c7cd157a9..1e750add65 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList; @@ -61,7 +62,7 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { - LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); + PacketLogger.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java index b12c280c6d..635799d26b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java @@ -18,12 +18,12 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -102,7 +102,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e); + PacketLogger.warning("Could not add friend objectid: " + e.getMessage()); } } else diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java index 2dad174d89..73cd9a6a4b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -26,6 +25,7 @@ import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -99,7 +99,7 @@ public class RequestFriendDel implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not del friend objectid: ", e); + PacketLogger.warning("Could not del friend objectid: " + e.getMessage()); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index 8a327f1f9c..ff61b200fb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.mentoring; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMenteeAdd; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -93,7 +93,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, e.getMessage(), e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java index 18445bd1c5..679dd76226 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.model.clan.ClanRewardBonus; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -77,7 +78,7 @@ public class RequestPledgeBonusReward implements IClientIncomingPacket } else { - LOGGER.warning(player + " Attempting to claim reward but clan(" + clan + ") doesn't have such!"); + PacketLogger.warning(player + " Attempting to claim reward but clan(" + clan + ") doesn't have such!"); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java index ee8910d06e..a53878b794 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductList; @@ -60,7 +61,7 @@ public class RequestBRProductList implements IClientIncomingPacket } default: { - LOGGER.warning(player + " send unhandled product list type: " + _type); + PacketLogger.warning(player + " send unhandled product list type: " + _type); break; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java index e1eb0d88df..00a18163da 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.SayuneRequest; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.type.SayuneZone; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; @@ -72,7 +73,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (zone.getMapId() == -1) { player.sendMessage("That zone is not supported yet!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); return; } @@ -80,7 +81,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (map == null) { player.sendMessage("This zone is not handled yet!!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java index f1ede4ef0a..41648f184f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Shuttle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -60,7 +61,7 @@ public class RequestShuttleGetOn implements IClientIncomingPacket player.getInVehiclePosition().setXYZ(_x, _y, _z); break; } - LOGGER.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); + PacketLogger.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 33eeff5060..1b8ddb2042 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -16,11 +16,10 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Level; - import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.util.Util; /** @@ -75,7 +74,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { if (html.length() > 17200) { - LOGGER.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable()); + PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } @@ -94,7 +93,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket if (content == null) { setHtml("My Text is missing:
" + path + ""); - LOGGER.warning("missing html page " + path); + PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index e6b4b8b604..57ed88ac29 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; /** @@ -46,7 +47,7 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index d94dbf4403..75f6596194 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Migi, DS @@ -44,7 +45,7 @@ public class ExReplySentPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index 7a9f6f7389..6ca5edc29b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author KenM @@ -54,7 +55,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); + PacketLogger.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); packet.writeS(""); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index b27eecaefa..650261e010 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IOutgoingPacket; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; @@ -28,8 +26,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; */ public interface IClientOutgoingPacket extends IOutgoingPacket { - Logger LOGGER = Logger.getLogger(IClientOutgoingPacket.class.getName()); - int[] PAPERDOLL_ORDER = new int[] { Inventory.PAPERDOLL_UNDER, diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 058e1d34b0..818c38a076 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan.SubPledge; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author -Wooden- @@ -56,7 +57,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket } else if (_clan.getClanMember(LeaderId) == null) { - LOGGER.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); + PacketLogger.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); return ""; } else diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index 2d436d0a58..59ec218c84 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.RecipeData; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class RecipeItemMakeInfo implements IClientOutgoingPacket { @@ -58,7 +59,8 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeQ(0x00); return true; } - LOGGER.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); + + PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 432ff8ad7f..0a3fe46cb7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Shows the Siege Info
@@ -78,7 +79,7 @@ public class SiegeInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Null owner for castle: " + _castle.getName()); + PacketLogger.warning("Null owner for castle: " + _castle.getName()); } } else diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 44f290e92f..746b2da3f7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; @@ -157,7 +158,7 @@ public class SystemMessage implements IClientOutgoingPacket // Mobius: With additional on-screen damage param (popup), length is increased. if (param.getType() != TYPE_POPUP_ID) { - LOGGER.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); + PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } @@ -414,7 +415,7 @@ public class SystemMessage implements IClientOutgoingPacket { if (param == null) { - LOGGER.warning("Found null parameter for SystemMessageId " + _smId); + PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 64fb395dda..6f57005e47 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -24,6 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class WareHouseWithdrawalList extends AbstractItemPacket { @@ -54,7 +55,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket _invSize = player.getInventory().getSize(); if (_player.getActiveWarehouse() == null) { - LOGGER.warning("error while sending withdraw request to: " + _player.getName()); + PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/PacketLogger.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/PacketLogger.java new file mode 100644 index 0000000000..5b5a083a99 --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/PacketLogger.java @@ -0,0 +1,42 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.network; + +import java.util.logging.Logger; + +/** + * @author Mobius + */ +public class PacketLogger +{ + private static final Logger LOGGER = Logger.getLogger(PacketLogger.class.getName()); + + public static synchronized void warning(String message) + { + LOGGER.warning(message); + } + + public static synchronized void info(String message) + { + LOGGER.info(message); + } + + public static synchronized void finer(String message) + { + LOGGER.finer(message); + } +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 7c343f78be..ef3f4acc18 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -161,7 +162,7 @@ public class Action implements IClientIncomingPacket default: { // Invalid action detected (probably client cheating), log this - LOGGER.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); + PacketLogger.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); client.sendPacket(ActionFailed.STATIC_PACKET); break; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index db177c478d..922a088a0b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; import org.l2jmobius.gameserver.network.serverpackets.TradeOwnAdd; @@ -57,7 +58,7 @@ public class AddTradeItem implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - LOGGER.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); + PacketLogger.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); return; } @@ -67,7 +68,7 @@ public class AddTradeItem implements IClientIncomingPacket // Trade partner not found, cancel trade if (partner != null) { - LOGGER.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); + PacketLogger.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); } player.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE); player.cancelActiveTrade(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 20134dd2bb..a3236b0d83 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -62,7 +62,7 @@ public class CannotMoveAnymore implements IClientIncomingPacket // player.stopMove(); // // if (Config.DEBUG) - // LOGGER.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ + // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); // StopMove smwl = new StopMove(player); // client.getPlayer().sendPacket(smwl); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index e25524223a..0b6571d963 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -43,6 +43,7 @@ import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; import org.l2jmobius.gameserver.network.serverpackets.CharCreateOk; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -124,21 +125,21 @@ public class CharacterCreate implements IClientIncomingPacket if ((_face > 2) || (_face < 0)) { - LOGGER.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairStyle < 0) || ((_sex == 0) && (_hairStyle > 4)) || ((_sex != 0) && (_hairStyle > 6))) { - LOGGER.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairColor > 3) || (_hairColor < 0)) { - LOGGER.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } @@ -303,7 +304,7 @@ public class CharacterCreate implements IClientIncomingPacket final Item item = newChar.getInventory().addItem("Init", ie.getId(), ie.getCount(), newChar, null); if (item == null) { - LOGGER.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); + PacketLogger.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); continue; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java index 86c425fa45..63c3261946 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Level; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.CharacterDeleteFailType; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -25,6 +23,7 @@ import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDelete; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteFail; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteSuccess; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -74,7 +73,7 @@ public class CharacterDelete implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Error:", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1, 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java index 5f74c38273..cfe9b20f3d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java @@ -47,7 +47,7 @@ public class EndScenePlayer implements IClientIncomingPacket final MovieHolder holder = player.getMovieHolder(); if ((holder == null) || (holder.getMovie().getClientId() != _movieId)) { - // LOGGER.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); + // PacketLogger.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 04bf851e0c..69fd802a87 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -67,6 +67,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.Die; @@ -151,7 +152,7 @@ public class EnterWorld implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.warning("EnterWorld failed! player returned 'null'."); + PacketLogger.warning("EnterWorld failed! player returned 'null'."); Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java index 8bde20da0a..14e8153478 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java @@ -25,9 +25,13 @@ import org.l2jmobius.gameserver.network.GameClient; */ public class ExGetOnAirShip implements IClientIncomingPacket { + @SuppressWarnings("unused") private int _x; + @SuppressWarnings("unused") private int _y; + @SuppressWarnings("unused") private int _z; + @SuppressWarnings("unused") private int _shipId; @Override @@ -43,9 +47,9 @@ public class ExGetOnAirShip implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("[T1:ExGetOnAirShip] x: " + _x); - LOGGER.info("[T1:ExGetOnAirShip] y: " + _y); - LOGGER.info("[T1:ExGetOnAirShip] z: " + _z); - LOGGER.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); + // PacketLogger.info("[T1:ExGetOnAirShip] x: " + _x); + // PacketLogger.info("[T1:ExGetOnAirShip] y: " + _y); + // PacketLogger.info("[T1:ExGetOnAirShip] z: " + _z); + // PacketLogger.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java index fcdd8335f4..4e91188f5c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java @@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Arrays; -import java.util.logging.Level; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: c dddd @@ -79,7 +79,7 @@ public class GameGuardReply implements IClientIncomingPacket } catch (NoSuchAlgorithmException e) { - LOGGER.log(Level.WARNING, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java index eddff9f891..62e69acd86 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.gameserver.network.GameClient; @@ -27,5 +25,4 @@ import org.l2jmobius.gameserver.network.GameClient; */ public interface IClientIncomingPacket extends IIncomingPacket { - Logger LOGGER = Logger.getLogger(IClientIncomingPacket.class.getName()); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index ea86074f0e..91a2b46047 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -153,7 +154,7 @@ public class MultiSellChoose implements IClientIncomingPacket if (((_soulCrystalOptions != null) && CommonUtil.contains(_soulCrystalOptions, null)) || ((_soulCrystalSpecialOptions != null) && CommonUtil.contains(_soulCrystalSpecialOptions, null))) { - LOGGER.severe("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -161,14 +162,14 @@ public class MultiSellChoose implements IClientIncomingPacket final MultisellEntryHolder entry = list.getEntries().get(_entryId - 1); // Entry Id begins from 1. We currently use entry IDs as index pointer. if (entry == null) { - LOGGER.severe("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } if (!entry.isStackable() && (_amount > 1)) { - LOGGER.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -196,7 +197,7 @@ public class MultiSellChoose implements IClientIncomingPacket )) //@formatter:on { - LOGGER.severe("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -368,7 +369,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); return; } } @@ -478,7 +479,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); return; } } @@ -673,7 +674,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); + PacketLogger.warning("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); return false; } } 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 b7b93ee7db..45cab77cbf 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 @@ -45,6 +45,7 @@ import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillDone; import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; @@ -105,7 +106,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if ((_level < 1) || (_level > 1000) || (_id < 1) || (_id > 64000)) { Util.handleIllegalPlayerAction(player, "Wrong Packet Data in Aquired Skill", Config.DEFAULT_PUNISH); - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); return; } @@ -119,7 +120,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - LOGGER.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -498,7 +499,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket } default: { - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); break; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 0a570fd3ef..4bb789645a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillInfo; import org.l2jmobius.gameserver.network.serverpackets.ExAcquireSkillInfo; @@ -55,7 +56,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket { if ((_id <= 0) || (_level <= 0)) { - LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); return; } @@ -74,7 +75,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level); if (skill == null) { - LOGGER.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); + PacketLogger.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); return; } 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 5e0a2af0c9..8078d0c10e 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.Arrays; -import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.ActionData; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; @@ -41,8 +41,6 @@ import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList; */ public class RequestActionUse implements IClientIncomingPacket { - private static final Logger LOGGER = Logger.getLogger(RequestActionUse.class.getName()); - private int _actionId; private boolean _ctrlPressed; private boolean _shiftPressed; @@ -93,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } @@ -107,7 +105,7 @@ public class RequestActionUse implements IClientIncomingPacket actionHandler.useAction(player, actionHolder, _ctrlPressed, _shiftPressed); return; } - LOGGER.warning("Couldnt find handler with name: " + actionHolder.getHandler()); + PacketLogger.warning("Couldn't find handler with name: " + actionHolder.getHandler()); return; } @@ -143,7 +141,7 @@ public class RequestActionUse implements IClientIncomingPacket } default: { - LOGGER.warning(player.getName() + ": unhandled action type " + _actionId); + PacketLogger.warning(player.getName() + ": unhandled action type " + _actionId); break; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java index 1fa1214bea..76649875f1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.data.xml.FakePlayerData; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -130,7 +131,7 @@ public class RequestBlock implements IClientIncomingPacket } default: { - LOGGER.info("Unknown 0xA9 block type: " + _type); + PacketLogger.info("Unknown 0xA9 block type: " + _type); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index eb7e62ebf2..ce3d851f06 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -161,7 +162,7 @@ public class RequestBuyItem implements IClientIncomingPacket long price = product.getPrice(); if (price < 0) { - LOGGER.warning("ERROR, no price found .. wrong buylist ??"); + PacketLogger.warning("ERROR, no price found .. wrong buylist ??"); client.sendPacket(ActionFailed.STATIC_PACKET); 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 a7e3f28ed6..dd5c90fce2 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.StringTokenizer; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -41,6 +40,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -88,7 +88,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -192,7 +192,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (NumberFormatException nfe) { - LOGGER.log(Level.WARNING, "NFE for command [" + _command + "]", nfe); + PacketLogger.warning("NFE for command [" + _command + "] " + nfe.getMessage()); } } else if (_command.startsWith("_match")) @@ -284,13 +284,13 @@ public class RequestBypassToServer implements IClientIncomingPacket } else { - LOGGER.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); + PacketLogger.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); } } } catch (Exception e) { - LOGGER.log(Level.WARNING, "Exception processing bypass from player " + player.getName() + ": " + _command, e); + PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _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/RequestCrystallizeItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index af45d9defb..03d610fe78 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -59,7 +60,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.finer("RequestCrystalizeItem: activeChar was null"); + // PacketLogger.finer("RequestCrystalizeItem: activeChar was null."); return; } @@ -87,7 +88,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - LOGGER.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index c67449efed..71bb657bf9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; @@ -33,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -169,7 +169,7 @@ public class RequestDestroyItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not delete pet objectid: ", e); + PacketLogger.warning("Could not delete pet objectid: " + e.getMessage()); } } if (itemToRemove.isTimeLimitedItem()) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 35f1f3c33e..5b6fea109a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.GMAudit; import org.l2jmobius.gameserver.util.Util; @@ -210,7 +211,7 @@ public class RequestDropItem implements IClientIncomingPacket if ((dropedItem != null) && (dropedItem.getId() == Inventory.ADENA_ID) && (dropedItem.getCount() >= 1000000)) { final String msg = "Character (" + player.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")"; - LOGGER.warning(msg); + PacketLogger.warning(msg); AdminData.getInstance().broadcastMessageToGMs(msg); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java index e3ab837779..e8bfc249c9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ExNeedToChangeName; /** @@ -42,6 +43,6 @@ public class RequestExChangeName implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); + PacketLogger.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java index 6e4861568e..c2f02f89ad 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chdd d: Arena d: Team @@ -74,7 +75,7 @@ public class RequestExCubeGameChangeTeam implements IClientIncomingPacket } default: { - LOGGER.warning("Wrong Cube Game Team ID: " + _team); + PacketLogger.warning("Wrong Cube Game Team ID: " + _team); break; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java index 009b836b6d..d72fdfc413 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chddd d: Arena d: Answer @@ -64,7 +65,7 @@ public class RequestExCubeGameReadyAnswer implements IClientIncomingPacket } default: { - LOGGER.warning("Unknown Cube Game Answer ID: " + _answer); + PacketLogger.warning("Unknown Cube Game Answer ID: " + _answer); break; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java index ff12adb20d..3347f01941 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) just a trigger @@ -34,6 +35,6 @@ public class RequestExFishRanking implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestExFishRanking"); + PacketLogger.info("C5: RequestExFishRanking"); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 57e8e7d2e5..8851aef463 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; import org.l2jmobius.gameserver.util.Broadcast; @@ -86,7 +87,7 @@ public class RequestExMagicSkillUseGround implements IClientIncomingPacket else { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("No skill found with id " + _skillId + " and level " + level + " !!"); + PacketLogger.warning("No skill found with id " + _skillId + " and level " + level + " !!"); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 77093c5f2d..2d9f0456f4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; @@ -73,7 +74,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket client.sendPacket(new ExPutEnchantTargetItemResult(0)); if (scrollTemplate == null) { - LOGGER.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); + PacketLogger.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); } return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java index 05e09e6dfc..0a4522bf64 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressMapInfo; @@ -43,7 +44,7 @@ public class RequestFortressMapInfo implements IClientIncomingPacket final Fort fort = FortManager.getInstance().getFortById(_fortressId); if (fort == null) { - LOGGER.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); + PacketLogger.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); if (client.getPlayer() == null) { 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 f65a63d325..dc903790d0 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 @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) d @@ -44,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - LOGGER.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning("Player " + 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/RequestGetItemFromPet.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index 2330851024..fc913f182b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.util.Util; /** @@ -78,7 +79,7 @@ public class RequestGetItemFromPet implements IClientIncomingPacket if (pet.transferItem("Transfer", _objectId, _amount, player.getInventory(), player, pet) == null) { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 66fb839f0e..81d0ee6d55 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; @@ -118,7 +119,7 @@ public class RequestGiveItemToPet implements IClientIncomingPacket if (player.transferItem("Transfer", _objectId, _amount, pet.getInventory(), pet) == null) { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } 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 d0add3fa49..04abcbce46 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 @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaEquipList; @@ -67,7 +68,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.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 fa21b68043..a7c019d65d 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; @@ -52,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - LOGGER.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); } client.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 b943775334..ff96a400c9 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; @@ -50,10 +51,11 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.sendPacket(ActionFailed.STATIC_PACKET); return; } + player.sendPacket(new HennaItemRemoveInfo(henna, player)); } } 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 ab9f0c33f7..89e11ba6a9 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -75,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); client.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 53f04488a6..ada67e190c 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -49,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - LOGGER.warning("Player " + actor.getName() + " sent empty html link!"); + PacketLogger.warning("Player " + actor.getName() + " sent empty html link!"); return; } if (_link.contains("..")) { - LOGGER.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); return; } final int htmlObjectId = actor.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - LOGGER.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java index 89adeae67b..2e1c1c83f6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author UnAfraid @@ -51,7 +52,7 @@ public class RequestMagicSkillList implements IClientIncomingPacket if (player.getObjectId() != _objectId) { - LOGGER.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); + PacketLogger.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 9432941937..a228079092 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -64,7 +64,7 @@ public class RequestMagicSkillUse implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); // if (_magicId > 0) // { - // LOGGER.warning("Skill Id " + _magicId + " not found in player: " + player); + // PacketLogger.warning("Skill Id " + _magicId + " not found in player: " + player); // } return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 5fbcac0eca..9149ce1284 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListDelete; @@ -71,7 +72,7 @@ public class RequestOustPledgeMember implements IClientIncomingPacket final ClanMember member = clan.getClanMember(_target); if (member == null) { - LOGGER.warning("Target (" + _target + ") is not member of the clan"); + PacketLogger.warning("Target (" + _target + ") is not member of the clan"); return; } if (member.isOnline() && member.getPlayer().isInCombat()) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java index 9702554c3b..209835b319 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) S @@ -37,6 +38,6 @@ public class RequestPCCafeCouponUse implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestPCCafeCouponUse: S: " + _str); + PacketLogger.info("C5: RequestPCCafeCouponUse: S: " + _str); } } 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 e4376f9ad5..14eb0ff29b 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 @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -120,7 +121,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item item = player.checkItemManipulation(i.getId(), i.getCount(), "freight"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); warehouse.deleteMe(); return; } @@ -169,7 +170,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); warehouse.deleteMe(); return; } @@ -177,7 +178,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem("Trade", i.getId(), i.getCount(), warehouse, player, null); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 26cfaf9835..d8b2285a2d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -136,7 +137,7 @@ public class RequestPetUseItem implements IClientIncomingPacket else { player.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM); - LOGGER.warning("No item handler registered for itemId: " + item.getId()); + PacketLogger.warning("No item handler registered for itemId: " + item.getId()); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index 8ece2b3ec7..fec0dc36a0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -25,6 +25,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Plim @@ -74,7 +75,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket } catch (SQLException e) { - LOGGER.severe("Error while saving petition feedback"); + PacketLogger.warning("Error while saving petition feedback."); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java index d212481717..3459b04c80 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java @@ -44,8 +44,8 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket @Override public void run(GameClient client) { - // LOGGER.info("C5: RequestPledgeMemberInfo d:"+_unk1); - // LOGGER.info("C5: RequestPledgeMemberInfo S:"+_player); + // PacketLogger.info("C5: RequestPledgeMemberInfo d:"+_unk1); + // PacketLogger.info("C5: RequestPledgeMemberInfo S:"+_player); final Player player = client.getPlayer(); if (player == null) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index e56c105cf4..44bbd9d34c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.HashMap; import java.util.Map; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -38,6 +37,7 @@ import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; @@ -74,7 +74,7 @@ public class RequestPreviewItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } @@ -152,7 +152,7 @@ public class RequestPreviewItem implements IClientIncomingPacket final Merchant merchant = (target instanceof Merchant) ? (Merchant) target : null; if (merchant == null) { - LOGGER.warning("Null merchant!"); + PacketLogger.warning(getClass().getSimpleName() + ": Null merchant!"); 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 251757c0ba..94958bc4fe 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.util.Util; @@ -145,7 +146,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if (result > 1) { - LOGGER.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); } return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java index 9998465898..8ab3d4962f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; public class RequestPrivateStoreSell implements IClientIncomingPacket @@ -134,7 +135,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket if (!storeList.privateStoreSell(player, _items)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index a4010ca2cb..1632df189f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -193,7 +194,7 @@ public class RequestRefundItem implements IClientIncomingPacket final Item item = player.getRefund().transferItem("Refund", objectIds[i], Long.MAX_VALUE, player.getInventory(), player, player.getLastFolkNPC()); if (item == null) { - LOGGER.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index ee78579ea4..8a2f42272a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket { @@ -54,7 +55,7 @@ public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket } else { - LOGGER.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); + PacketLogger.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); } player.onTransactionRequest(requestor); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index afc4e65df4..08ad2c7763 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @version $Revision: 1.7.2.3.2.6 $ $Date: 2005/03/27 15:29:30 $ @@ -139,7 +140,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if ((player.getClan() == null) || (player.getClan().getHideoutId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.CLANHALL); @@ -167,7 +168,7 @@ public class RequestRestartPoint implements IClientIncomingPacket } else { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); return; } } @@ -199,7 +200,7 @@ public class RequestRestartPoint implements IClientIncomingPacket final Clan clan = player.getClan(); if ((clan == null) || (clan.getFortId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.FORTRESS); @@ -231,7 +232,7 @@ public class RequestRestartPoint implements IClientIncomingPacket if (((siegeClan == null) || siegeClan.getFlag().isEmpty())) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.SIEGEFLAG); @@ -241,7 +242,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if (!player.isGM() && !player.getInventory().haveItemForSelfResurrection()) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); return; } if (player.isGM() || player.destroyItemByItemId("Feather", 10649, 1, player, false) || player.destroyItemByItemId("Feather", 13300, 1, player, false) || player.destroyItemByItemId("Feather", 13128, 1, player, false)) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 33a10fd20c..5014c0b7d0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExNoticePostSent; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -316,14 +317,14 @@ public class RequestSendPost implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getObjectId(), i.getCount(), "attach"); if ((oldItem == null) || !oldItem.isTradeable() || oldItem.isEquipped()) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); return false; } final Item newItem = player.getInventory().transferItem("SendMail", i.getObjectId(), i.getCount(), attachments, player, msg.getReceiverName() + "[" + msg.getReceiverId() + "]"); if (newItem == null) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java index 2a33016c9a..b5d130046c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -54,16 +55,16 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket final Castle castle = CastleManager.getInstance().getCastleById(_castleId); if ((player == null) || (castle == null)) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); return; } if ((castle.getOwnerId() > 0) && (castle.getOwnerId() != player.getClanId())) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); } else if (!player.isClanLeader()) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); } else if (!castle.isTimeRegistrationOver()) { @@ -79,12 +80,12 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); } } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); } } 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 6d1eea218a..c600906d81 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 @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; @@ -108,7 +109,7 @@ public class Say2 implements IClientIncomingPacket ChatType chatType = ChatType.findByClientId(_type); if (chatType == null) { - LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); + PacketLogger.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -116,7 +117,7 @@ public class Say2 implements IClientIncomingPacket if (_text.isEmpty()) { - LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); + PacketLogger.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -210,7 +211,7 @@ public class Say2 implements IClientIncomingPacket } else { - LOGGER.info("No handler registered for ChatType: " + _type + " Player: " + client); + PacketLogger.info("No handler registered for ChatType: " + _type + " Player: " + client); } } @@ -256,7 +257,7 @@ public class Say2 implements IClientIncomingPacket final Item item = owner.getInventory().getItemByObjectId(id); if (item == null) { - LOGGER.info(client + " trying publish item which doesnt own! ID:" + id); + PacketLogger.info(client + " trying publish item which doesnt own! ID:" + id); return false; } item.publish(); @@ -264,7 +265,7 @@ public class Say2 implements IClientIncomingPacket pos1 = _text.indexOf(8, pos) + 1; if (pos1 == 0) // missing ending tag { - LOGGER.info(client + " sent invalid publish item msg! ID:" + id); + PacketLogger.info(client + " sent invalid publish item msg! ID:" + id); return false; } } 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 ee93527570..7cdde1c7bb 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 @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -127,7 +128,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item item = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); return; } @@ -174,7 +175,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } @@ -186,7 +187,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem(warehouse.getName(), itemHolder.getId(), itemHolder.getCount(), warehouse, player, manager); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 3de872e222..54b59f3ea5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; @@ -163,13 +164,13 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket final Item oldItem = warehouse.getItemByObjectId(i.getId()); if ((oldItem == null) || (oldItem.getCount() < i.getCount())) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } final Item newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, manager); if (newItem == null) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); return; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index b42c56a13c..cd4f0c7c64 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -43,6 +43,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUseSharedGroupItem; @@ -274,7 +275,7 @@ public class UseItem implements IClientIncomingPacket { if ((etcItem != null) && (etcItem.getHandlerName() != null)) { - LOGGER.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); + PacketLogger.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); } } else if (handler.useItem(player, item, _ctrlPressed)) 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 20d84a2bd6..6b2f96e87d 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; @@ -60,37 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - LOGGER.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 30% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 100% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - LOGGER.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - - LOGGER.warning("Player " + player + ": Auction House (15-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); return; - } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - LOGGER.warning("Player " + player + ": Auction House (30-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + 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/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index b4b5bd9011..e4e46a5271 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -94,7 +95,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning(player + ": tried to crystallize " + item.getItem()); + PacketLogger.warning(player + ": tried to crystallize " + item.getItem()); return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index 999f5b7619..d8a8f85043 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward; @@ -62,7 +63,7 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { - LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); + PacketLogger.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java index b12c280c6d..635799d26b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java @@ -18,12 +18,12 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -102,7 +102,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e); + PacketLogger.warning("Could not add friend objectid: " + e.getMessage()); } } else diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java index 2dad174d89..73cd9a6a4b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -26,6 +25,7 @@ import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -99,7 +99,7 @@ public class RequestFriendDel implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not del friend objectid: ", e); + PacketLogger.warning("Could not del friend objectid: " + e.getMessage()); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index 8a327f1f9c..ff61b200fb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.mentoring; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMenteeAdd; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -93,7 +93,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, e.getMessage(), e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java index 18445bd1c5..679dd76226 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.model.clan.ClanRewardBonus; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -77,7 +78,7 @@ public class RequestPledgeBonusReward implements IClientIncomingPacket } else { - LOGGER.warning(player + " Attempting to claim reward but clan(" + clan + ") doesn't have such!"); + PacketLogger.warning(player + " Attempting to claim reward but clan(" + clan + ") doesn't have such!"); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java index ee8910d06e..a53878b794 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductList; @@ -60,7 +61,7 @@ public class RequestBRProductList implements IClientIncomingPacket } default: { - LOGGER.warning(player + " send unhandled product list type: " + _type); + PacketLogger.warning(player + " send unhandled product list type: " + _type); break; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java index e1eb0d88df..00a18163da 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.SayuneRequest; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.type.SayuneZone; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; @@ -72,7 +73,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (zone.getMapId() == -1) { player.sendMessage("That zone is not supported yet!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); return; } @@ -80,7 +81,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (map == null) { player.sendMessage("This zone is not handled yet!!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java index f1ede4ef0a..41648f184f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Shuttle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -60,7 +61,7 @@ public class RequestShuttleGetOn implements IClientIncomingPacket player.getInVehiclePosition().setXYZ(_x, _y, _z); break; } - LOGGER.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); + PacketLogger.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 33eeff5060..1b8ddb2042 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -16,11 +16,10 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Level; - import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.util.Util; /** @@ -75,7 +74,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { if (html.length() > 17200) { - LOGGER.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable()); + PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } @@ -94,7 +93,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket if (content == null) { setHtml("My Text is missing:
" + path + ""); - LOGGER.warning("missing html page " + path); + PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index e6b4b8b604..57ed88ac29 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; /** @@ -46,7 +47,7 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index d94dbf4403..75f6596194 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Migi, DS @@ -44,7 +45,7 @@ public class ExReplySentPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index b0f3738683..15d011befc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author KenM @@ -54,7 +55,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); + PacketLogger.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); packet.writeS(""); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index b27eecaefa..650261e010 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IOutgoingPacket; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; @@ -28,8 +26,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; */ public interface IClientOutgoingPacket extends IOutgoingPacket { - Logger LOGGER = Logger.getLogger(IClientOutgoingPacket.class.getName()); - int[] PAPERDOLL_ORDER = new int[] { Inventory.PAPERDOLL_UNDER, diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 058e1d34b0..818c38a076 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan.SubPledge; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author -Wooden- @@ -56,7 +57,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket } else if (_clan.getClanMember(LeaderId) == null) { - LOGGER.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); + PacketLogger.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); return ""; } else diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index 2d436d0a58..59ec218c84 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.RecipeData; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class RecipeItemMakeInfo implements IClientOutgoingPacket { @@ -58,7 +59,8 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeQ(0x00); return true; } - LOGGER.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); + + PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 432ff8ad7f..0a3fe46cb7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Shows the Siege Info
@@ -78,7 +79,7 @@ public class SiegeInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Null owner for castle: " + _castle.getName()); + PacketLogger.warning("Null owner for castle: " + _castle.getName()); } } else diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 44f290e92f..746b2da3f7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; @@ -157,7 +158,7 @@ public class SystemMessage implements IClientOutgoingPacket // Mobius: With additional on-screen damage param (popup), length is increased. if (param.getType() != TYPE_POPUP_ID) { - LOGGER.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); + PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } @@ -414,7 +415,7 @@ public class SystemMessage implements IClientOutgoingPacket { if (param == null) { - LOGGER.warning("Found null parameter for SystemMessageId " + _smId); + PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 64fb395dda..6f57005e47 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -24,6 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class WareHouseWithdrawalList extends AbstractItemPacket { @@ -54,7 +55,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket _invSize = player.getInventory().getSize(); if (_player.getActiveWarehouse() == null) { - LOGGER.warning("error while sending withdraw request to: " + _player.getName()); + PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/PacketLogger.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/PacketLogger.java new file mode 100644 index 0000000000..5b5a083a99 --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/PacketLogger.java @@ -0,0 +1,42 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.network; + +import java.util.logging.Logger; + +/** + * @author Mobius + */ +public class PacketLogger +{ + private static final Logger LOGGER = Logger.getLogger(PacketLogger.class.getName()); + + public static synchronized void warning(String message) + { + LOGGER.warning(message); + } + + public static synchronized void info(String message) + { + LOGGER.info(message); + } + + public static synchronized void finer(String message) + { + LOGGER.finer(message); + } +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 7c343f78be..ef3f4acc18 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -161,7 +162,7 @@ public class Action implements IClientIncomingPacket default: { // Invalid action detected (probably client cheating), log this - LOGGER.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); + PacketLogger.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); client.sendPacket(ActionFailed.STATIC_PACKET); break; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index 31d29ef3dd..8e8ae2c190 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; import org.l2jmobius.gameserver.network.serverpackets.TradeOwnAdd; @@ -58,7 +59,7 @@ public class AddTradeItem implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - LOGGER.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); + PacketLogger.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); return; } @@ -68,7 +69,7 @@ public class AddTradeItem implements IClientIncomingPacket // Trade partner not found, cancel trade if (partner != null) { - LOGGER.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); + PacketLogger.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); } player.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE); player.cancelActiveTrade(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 20134dd2bb..a3236b0d83 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -62,7 +62,7 @@ public class CannotMoveAnymore implements IClientIncomingPacket // player.stopMove(); // // if (Config.DEBUG) - // LOGGER.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ + // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); // StopMove smwl = new StopMove(player); // client.getPlayer().sendPacket(smwl); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index e25524223a..0b6571d963 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -43,6 +43,7 @@ import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; import org.l2jmobius.gameserver.network.serverpackets.CharCreateOk; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -124,21 +125,21 @@ public class CharacterCreate implements IClientIncomingPacket if ((_face > 2) || (_face < 0)) { - LOGGER.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairStyle < 0) || ((_sex == 0) && (_hairStyle > 4)) || ((_sex != 0) && (_hairStyle > 6))) { - LOGGER.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairColor > 3) || (_hairColor < 0)) { - LOGGER.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } @@ -303,7 +304,7 @@ public class CharacterCreate implements IClientIncomingPacket final Item item = newChar.getInventory().addItem("Init", ie.getId(), ie.getCount(), newChar, null); if (item == null) { - LOGGER.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); + PacketLogger.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); continue; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java index 86c425fa45..63c3261946 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Level; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.CharacterDeleteFailType; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -25,6 +23,7 @@ import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDelete; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteFail; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteSuccess; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -74,7 +73,7 @@ public class CharacterDelete implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Error:", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1, 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java index 5f74c38273..cfe9b20f3d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java @@ -47,7 +47,7 @@ public class EndScenePlayer implements IClientIncomingPacket final MovieHolder holder = player.getMovieHolder(); if ((holder == null) || (holder.getMovie().getClientId() != _movieId)) { - // LOGGER.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); + // PacketLogger.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index abc244ddcd..e640f6074d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -68,6 +68,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.Die; @@ -152,7 +153,7 @@ public class EnterWorld implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.warning("EnterWorld failed! player returned 'null'."); + PacketLogger.warning("EnterWorld failed! player returned 'null'."); Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java index 8bde20da0a..14e8153478 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java @@ -25,9 +25,13 @@ import org.l2jmobius.gameserver.network.GameClient; */ public class ExGetOnAirShip implements IClientIncomingPacket { + @SuppressWarnings("unused") private int _x; + @SuppressWarnings("unused") private int _y; + @SuppressWarnings("unused") private int _z; + @SuppressWarnings("unused") private int _shipId; @Override @@ -43,9 +47,9 @@ public class ExGetOnAirShip implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("[T1:ExGetOnAirShip] x: " + _x); - LOGGER.info("[T1:ExGetOnAirShip] y: " + _y); - LOGGER.info("[T1:ExGetOnAirShip] z: " + _z); - LOGGER.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); + // PacketLogger.info("[T1:ExGetOnAirShip] x: " + _x); + // PacketLogger.info("[T1:ExGetOnAirShip] y: " + _y); + // PacketLogger.info("[T1:ExGetOnAirShip] z: " + _z); + // PacketLogger.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java index fcdd8335f4..4e91188f5c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java @@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Arrays; -import java.util.logging.Level; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: c dddd @@ -79,7 +79,7 @@ public class GameGuardReply implements IClientIncomingPacket } catch (NoSuchAlgorithmException e) { - LOGGER.log(Level.WARNING, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java index eddff9f891..62e69acd86 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.gameserver.network.GameClient; @@ -27,5 +25,4 @@ import org.l2jmobius.gameserver.network.GameClient; */ public interface IClientIncomingPacket extends IIncomingPacket { - Logger LOGGER = Logger.getLogger(IClientIncomingPacket.class.getName()); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index ea86074f0e..91a2b46047 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -153,7 +154,7 @@ public class MultiSellChoose implements IClientIncomingPacket if (((_soulCrystalOptions != null) && CommonUtil.contains(_soulCrystalOptions, null)) || ((_soulCrystalSpecialOptions != null) && CommonUtil.contains(_soulCrystalSpecialOptions, null))) { - LOGGER.severe("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -161,14 +162,14 @@ public class MultiSellChoose implements IClientIncomingPacket final MultisellEntryHolder entry = list.getEntries().get(_entryId - 1); // Entry Id begins from 1. We currently use entry IDs as index pointer. if (entry == null) { - LOGGER.severe("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } if (!entry.isStackable() && (_amount > 1)) { - LOGGER.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -196,7 +197,7 @@ public class MultiSellChoose implements IClientIncomingPacket )) //@formatter:on { - LOGGER.severe("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -368,7 +369,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); return; } } @@ -478,7 +479,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); return; } } @@ -673,7 +674,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); + PacketLogger.warning("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); return false; } } 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 4713192b93..353d680abb 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 @@ -45,6 +45,7 @@ import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillDone; import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; @@ -105,7 +106,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if ((_level < 1) || (_level > 1000) || (_id < 1) || (_id > 64000)) { Util.handleIllegalPlayerAction(player, "Wrong Packet Data in Aquired Skill", Config.DEFAULT_PUNISH); - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); return; } @@ -119,7 +120,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - LOGGER.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -498,7 +499,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket } default: { - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); break; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 0a570fd3ef..4bb789645a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillInfo; import org.l2jmobius.gameserver.network.serverpackets.ExAcquireSkillInfo; @@ -55,7 +56,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket { if ((_id <= 0) || (_level <= 0)) { - LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); return; } @@ -74,7 +75,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level); if (skill == null) { - LOGGER.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); + PacketLogger.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); return; } 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 5e0a2af0c9..8078d0c10e 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.Arrays; -import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.ActionData; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; @@ -41,8 +41,6 @@ import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList; */ public class RequestActionUse implements IClientIncomingPacket { - private static final Logger LOGGER = Logger.getLogger(RequestActionUse.class.getName()); - private int _actionId; private boolean _ctrlPressed; private boolean _shiftPressed; @@ -93,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } @@ -107,7 +105,7 @@ public class RequestActionUse implements IClientIncomingPacket actionHandler.useAction(player, actionHolder, _ctrlPressed, _shiftPressed); return; } - LOGGER.warning("Couldnt find handler with name: " + actionHolder.getHandler()); + PacketLogger.warning("Couldn't find handler with name: " + actionHolder.getHandler()); return; } @@ -143,7 +141,7 @@ public class RequestActionUse implements IClientIncomingPacket } default: { - LOGGER.warning(player.getName() + ": unhandled action type " + _actionId); + PacketLogger.warning(player.getName() + ": unhandled action type " + _actionId); break; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java index 1fa1214bea..76649875f1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.data.xml.FakePlayerData; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -130,7 +131,7 @@ public class RequestBlock implements IClientIncomingPacket } default: { - LOGGER.info("Unknown 0xA9 block type: " + _type); + PacketLogger.info("Unknown 0xA9 block type: " + _type); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index eb7e62ebf2..ce3d851f06 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -161,7 +162,7 @@ public class RequestBuyItem implements IClientIncomingPacket long price = product.getPrice(); if (price < 0) { - LOGGER.warning("ERROR, no price found .. wrong buylist ??"); + PacketLogger.warning("ERROR, no price found .. wrong buylist ??"); client.sendPacket(ActionFailed.STATIC_PACKET); 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 a7e3f28ed6..dd5c90fce2 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.StringTokenizer; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -41,6 +40,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -88,7 +88,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -192,7 +192,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (NumberFormatException nfe) { - LOGGER.log(Level.WARNING, "NFE for command [" + _command + "]", nfe); + PacketLogger.warning("NFE for command [" + _command + "] " + nfe.getMessage()); } } else if (_command.startsWith("_match")) @@ -284,13 +284,13 @@ public class RequestBypassToServer implements IClientIncomingPacket } else { - LOGGER.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); + PacketLogger.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); } } } catch (Exception e) { - LOGGER.log(Level.WARNING, "Exception processing bypass from player " + player.getName() + ": " + _command, e); + PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _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/RequestCrystallizeItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index af45d9defb..03d610fe78 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -59,7 +60,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.finer("RequestCrystalizeItem: activeChar was null"); + // PacketLogger.finer("RequestCrystalizeItem: activeChar was null."); return; } @@ -87,7 +88,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - LOGGER.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index a99d5fcb63..1e735c8742 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; @@ -33,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -169,7 +169,7 @@ public class RequestDestroyItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not delete pet objectid: ", e); + PacketLogger.warning("Could not delete pet objectid: " + e.getMessage()); } } if (itemToRemove.isTimeLimitedItem()) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 0e4b623bb3..b7d4ac63a9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.GMAudit; import org.l2jmobius.gameserver.util.Util; @@ -210,7 +211,7 @@ public class RequestDropItem implements IClientIncomingPacket if ((dropedItem != null) && (dropedItem.getId() == Inventory.ADENA_ID) && (dropedItem.getCount() >= 1000000)) { final String msg = "Character (" + player.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")"; - LOGGER.warning(msg); + PacketLogger.warning(msg); AdminData.getInstance().broadcastMessageToGMs(msg); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java index e3ab837779..e8bfc249c9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ExNeedToChangeName; /** @@ -42,6 +43,6 @@ public class RequestExChangeName implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); + PacketLogger.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java index 6e4861568e..c2f02f89ad 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chdd d: Arena d: Team @@ -74,7 +75,7 @@ public class RequestExCubeGameChangeTeam implements IClientIncomingPacket } default: { - LOGGER.warning("Wrong Cube Game Team ID: " + _team); + PacketLogger.warning("Wrong Cube Game Team ID: " + _team); break; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java index 009b836b6d..d72fdfc413 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chddd d: Arena d: Answer @@ -64,7 +65,7 @@ public class RequestExCubeGameReadyAnswer implements IClientIncomingPacket } default: { - LOGGER.warning("Unknown Cube Game Answer ID: " + _answer); + PacketLogger.warning("Unknown Cube Game Answer ID: " + _answer); break; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java index ff12adb20d..3347f01941 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) just a trigger @@ -34,6 +35,6 @@ public class RequestExFishRanking implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestExFishRanking"); + PacketLogger.info("C5: RequestExFishRanking"); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 57e8e7d2e5..8851aef463 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; import org.l2jmobius.gameserver.util.Broadcast; @@ -86,7 +87,7 @@ public class RequestExMagicSkillUseGround implements IClientIncomingPacket else { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("No skill found with id " + _skillId + " and level " + level + " !!"); + PacketLogger.warning("No skill found with id " + _skillId + " and level " + level + " !!"); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 77093c5f2d..2d9f0456f4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; @@ -73,7 +74,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket client.sendPacket(new ExPutEnchantTargetItemResult(0)); if (scrollTemplate == null) { - LOGGER.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); + PacketLogger.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); } return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java index 05e09e6dfc..0a4522bf64 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressMapInfo; @@ -43,7 +44,7 @@ public class RequestFortressMapInfo implements IClientIncomingPacket final Fort fort = FortManager.getInstance().getFortById(_fortressId); if (fort == null) { - LOGGER.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); + PacketLogger.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); if (client.getPlayer() == null) { 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 f65a63d325..dc903790d0 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 @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) d @@ -44,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - LOGGER.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning("Player " + 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/RequestGetItemFromPet.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index a9fd8d923a..48e75fc61b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.util.Util; @@ -84,7 +85,7 @@ public class RequestGetItemFromPet implements IClientIncomingPacket } else { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 79e1193ac0..22f2f24422 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.util.Util; @@ -124,7 +125,7 @@ public class RequestGiveItemToPet implements IClientIncomingPacket } else { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } 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 d0add3fa49..04abcbce46 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 @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaEquipList; @@ -67,7 +68,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.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 fa21b68043..a7c019d65d 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; @@ -52,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - LOGGER.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); } client.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 b943775334..ff96a400c9 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; @@ -50,10 +51,11 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.sendPacket(ActionFailed.STATIC_PACKET); return; } + player.sendPacket(new HennaItemRemoveInfo(henna, player)); } } 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 ab9f0c33f7..89e11ba6a9 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -75,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); client.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 53f04488a6..ada67e190c 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -49,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - LOGGER.warning("Player " + actor.getName() + " sent empty html link!"); + PacketLogger.warning("Player " + actor.getName() + " sent empty html link!"); return; } if (_link.contains("..")) { - LOGGER.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); return; } final int htmlObjectId = actor.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - LOGGER.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java index 89adeae67b..2e1c1c83f6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author UnAfraid @@ -51,7 +52,7 @@ public class RequestMagicSkillList implements IClientIncomingPacket if (player.getObjectId() != _objectId) { - LOGGER.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); + PacketLogger.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 9432941937..a228079092 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -64,7 +64,7 @@ public class RequestMagicSkillUse implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); // if (_magicId > 0) // { - // LOGGER.warning("Skill Id " + _magicId + " not found in player: " + player); + // PacketLogger.warning("Skill Id " + _magicId + " not found in player: " + player); // } return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 5fbcac0eca..9149ce1284 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListDelete; @@ -71,7 +72,7 @@ public class RequestOustPledgeMember implements IClientIncomingPacket final ClanMember member = clan.getClanMember(_target); if (member == null) { - LOGGER.warning("Target (" + _target + ") is not member of the clan"); + PacketLogger.warning("Target (" + _target + ") is not member of the clan"); return; } if (member.isOnline() && member.getPlayer().isInCombat()) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java index 9702554c3b..209835b319 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) S @@ -37,6 +38,6 @@ public class RequestPCCafeCouponUse implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestPCCafeCouponUse: S: " + _str); + PacketLogger.info("C5: RequestPCCafeCouponUse: S: " + _str); } } 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 7da966ce9f..2cd9c6a8d1 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 @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -120,7 +121,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item item = player.checkItemManipulation(i.getId(), i.getCount(), "freight"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); warehouse.deleteMe(); return; } @@ -169,7 +170,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); warehouse.deleteMe(); return; } @@ -177,7 +178,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem("Trade", i.getId(), i.getCount(), warehouse, player, null); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 2c715b4efb..0d858fb452 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -137,7 +138,7 @@ public class RequestPetUseItem implements IClientIncomingPacket else { player.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM); - LOGGER.warning("No item handler registered for itemId: " + item.getId()); + PacketLogger.warning("No item handler registered for itemId: " + item.getId()); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index 8ece2b3ec7..fec0dc36a0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -25,6 +25,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Plim @@ -74,7 +75,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket } catch (SQLException e) { - LOGGER.severe("Error while saving petition feedback"); + PacketLogger.warning("Error while saving petition feedback."); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java index d212481717..3459b04c80 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java @@ -44,8 +44,8 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket @Override public void run(GameClient client) { - // LOGGER.info("C5: RequestPledgeMemberInfo d:"+_unk1); - // LOGGER.info("C5: RequestPledgeMemberInfo S:"+_player); + // PacketLogger.info("C5: RequestPledgeMemberInfo d:"+_unk1); + // PacketLogger.info("C5: RequestPledgeMemberInfo S:"+_player); final Player player = client.getPlayer(); if (player == null) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index e56c105cf4..44bbd9d34c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.HashMap; import java.util.Map; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -38,6 +37,7 @@ import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; @@ -74,7 +74,7 @@ public class RequestPreviewItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } @@ -152,7 +152,7 @@ public class RequestPreviewItem implements IClientIncomingPacket final Merchant merchant = (target instanceof Merchant) ? (Merchant) target : null; if (merchant == null) { - LOGGER.warning("Null merchant!"); + PacketLogger.warning(getClass().getSimpleName() + ": Null merchant!"); 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 251757c0ba..94958bc4fe 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.util.Util; @@ -145,7 +146,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if (result > 1) { - LOGGER.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); } return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java index 9998465898..8ab3d4962f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; public class RequestPrivateStoreSell implements IClientIncomingPacket @@ -134,7 +135,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket if (!storeList.privateStoreSell(player, _items)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index a4010ca2cb..1632df189f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -193,7 +194,7 @@ public class RequestRefundItem implements IClientIncomingPacket final Item item = player.getRefund().transferItem("Refund", objectIds[i], Long.MAX_VALUE, player.getInventory(), player, player.getLastFolkNPC()); if (item == null) { - LOGGER.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index ee78579ea4..8a2f42272a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket { @@ -54,7 +55,7 @@ public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket } else { - LOGGER.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); + PacketLogger.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); } player.onTransactionRequest(requestor); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index afc4e65df4..08ad2c7763 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @version $Revision: 1.7.2.3.2.6 $ $Date: 2005/03/27 15:29:30 $ @@ -139,7 +140,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if ((player.getClan() == null) || (player.getClan().getHideoutId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.CLANHALL); @@ -167,7 +168,7 @@ public class RequestRestartPoint implements IClientIncomingPacket } else { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); return; } } @@ -199,7 +200,7 @@ public class RequestRestartPoint implements IClientIncomingPacket final Clan clan = player.getClan(); if ((clan == null) || (clan.getFortId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.FORTRESS); @@ -231,7 +232,7 @@ public class RequestRestartPoint implements IClientIncomingPacket if (((siegeClan == null) || siegeClan.getFlag().isEmpty())) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.SIEGEFLAG); @@ -241,7 +242,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if (!player.isGM() && !player.getInventory().haveItemForSelfResurrection()) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); return; } if (player.isGM() || player.destroyItemByItemId("Feather", 10649, 1, player, false) || player.destroyItemByItemId("Feather", 13300, 1, player, false) || player.destroyItemByItemId("Feather", 13128, 1, player, false)) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index ecb0ab9738..9f217064bb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExNoticePostSent; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -316,14 +317,14 @@ public class RequestSendPost implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getObjectId(), i.getCount(), "attach"); if ((oldItem == null) || !oldItem.isTradeable() || oldItem.isEquipped()) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); return false; } final Item newItem = player.getInventory().transferItem("SendMail", i.getObjectId(), i.getCount(), attachments, player, msg.getReceiverName() + "[" + msg.getReceiverId() + "]"); if (newItem == null) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java index 2a33016c9a..b5d130046c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -54,16 +55,16 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket final Castle castle = CastleManager.getInstance().getCastleById(_castleId); if ((player == null) || (castle == null)) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); return; } if ((castle.getOwnerId() > 0) && (castle.getOwnerId() != player.getClanId())) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); } else if (!player.isClanLeader()) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); } else if (!castle.isTimeRegistrationOver()) { @@ -79,12 +80,12 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); } } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); } } 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 6d1eea218a..c600906d81 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 @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; @@ -108,7 +109,7 @@ public class Say2 implements IClientIncomingPacket ChatType chatType = ChatType.findByClientId(_type); if (chatType == null) { - LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); + PacketLogger.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -116,7 +117,7 @@ public class Say2 implements IClientIncomingPacket if (_text.isEmpty()) { - LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); + PacketLogger.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -210,7 +211,7 @@ public class Say2 implements IClientIncomingPacket } else { - LOGGER.info("No handler registered for ChatType: " + _type + " Player: " + client); + PacketLogger.info("No handler registered for ChatType: " + _type + " Player: " + client); } } @@ -256,7 +257,7 @@ public class Say2 implements IClientIncomingPacket final Item item = owner.getInventory().getItemByObjectId(id); if (item == null) { - LOGGER.info(client + " trying publish item which doesnt own! ID:" + id); + PacketLogger.info(client + " trying publish item which doesnt own! ID:" + id); return false; } item.publish(); @@ -264,7 +265,7 @@ public class Say2 implements IClientIncomingPacket pos1 = _text.indexOf(8, pos) + 1; if (pos1 == 0) // missing ending tag { - LOGGER.info(client + " sent invalid publish item msg! ID:" + id); + PacketLogger.info(client + " sent invalid publish item msg! ID:" + id); return false; } } 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 f89be1cfcb..84b879e0f7 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 @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -127,7 +128,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item item = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); return; } @@ -174,7 +175,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } @@ -186,7 +187,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem(warehouse.getName(), itemHolder.getId(), itemHolder.getCount(), warehouse, player, manager); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 1840fcded7..647761584a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; @@ -163,13 +164,13 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket final Item oldItem = warehouse.getItemByObjectId(i.getId()); if ((oldItem == null) || (oldItem.getCount() < i.getCount())) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } final Item newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, manager); if (newItem == null) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); return; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index bf6304577f..5712724618 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -43,6 +43,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUseSharedGroupItem; @@ -271,7 +272,7 @@ public class UseItem implements IClientIncomingPacket { if ((etcItem != null) && (etcItem.getHandlerName() != null)) { - LOGGER.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); + PacketLogger.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); } } else if (handler.useItem(player, item, _ctrlPressed)) 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 20d84a2bd6..6b2f96e87d 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; @@ -60,37 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - LOGGER.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 30% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 100% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - LOGGER.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - - LOGGER.warning("Player " + player + ": Auction House (15-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); return; - } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - LOGGER.warning("Player " + player + ": Auction House (30-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + 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/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index b4b5bd9011..e4e46a5271 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -94,7 +95,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning(player + ": tried to crystallize " + item.getItem()); + PacketLogger.warning(player + ": tried to crystallize " + item.getItem()); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index 999f5b7619..d8a8f85043 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward; @@ -62,7 +63,7 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { - LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); + PacketLogger.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java index b12c280c6d..635799d26b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java @@ -18,12 +18,12 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -102,7 +102,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e); + PacketLogger.warning("Could not add friend objectid: " + e.getMessage()); } } else diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java index 2dad174d89..73cd9a6a4b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -26,6 +25,7 @@ import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -99,7 +99,7 @@ public class RequestFriendDel implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not del friend objectid: ", e); + PacketLogger.warning("Could not del friend objectid: " + e.getMessage()); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index 8a327f1f9c..ff61b200fb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.mentoring; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMenteeAdd; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -93,7 +93,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, e.getMessage(), e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java index 18445bd1c5..679dd76226 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.model.clan.ClanRewardBonus; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -77,7 +78,7 @@ public class RequestPledgeBonusReward implements IClientIncomingPacket } else { - LOGGER.warning(player + " Attempting to claim reward but clan(" + clan + ") doesn't have such!"); + PacketLogger.warning(player + " Attempting to claim reward but clan(" + clan + ") doesn't have such!"); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java index ee8910d06e..a53878b794 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductList; @@ -60,7 +61,7 @@ public class RequestBRProductList implements IClientIncomingPacket } default: { - LOGGER.warning(player + " send unhandled product list type: " + _type); + PacketLogger.warning(player + " send unhandled product list type: " + _type); break; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java index e1eb0d88df..00a18163da 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.SayuneRequest; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.type.SayuneZone; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; @@ -72,7 +73,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (zone.getMapId() == -1) { player.sendMessage("That zone is not supported yet!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); return; } @@ -80,7 +81,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (map == null) { player.sendMessage("This zone is not handled yet!!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java index f1ede4ef0a..41648f184f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Shuttle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -60,7 +61,7 @@ public class RequestShuttleGetOn implements IClientIncomingPacket player.getInVehiclePosition().setXYZ(_x, _y, _z); break; } - LOGGER.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); + PacketLogger.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 33eeff5060..1b8ddb2042 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -16,11 +16,10 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Level; - import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.util.Util; /** @@ -75,7 +74,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { if (html.length() > 17200) { - LOGGER.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable()); + PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } @@ -94,7 +93,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket if (content == null) { setHtml("My Text is missing:
" + path + ""); - LOGGER.warning("missing html page " + path); + PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index e6b4b8b604..57ed88ac29 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; /** @@ -46,7 +47,7 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index d94dbf4403..75f6596194 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Migi, DS @@ -44,7 +45,7 @@ public class ExReplySentPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index b0f3738683..15d011befc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author KenM @@ -54,7 +55,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); + PacketLogger.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); packet.writeS(""); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index bff97454e1..e7d3f6f386 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IOutgoingPacket; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; @@ -28,8 +26,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; */ public interface IClientOutgoingPacket extends IOutgoingPacket { - Logger LOGGER = Logger.getLogger(IClientOutgoingPacket.class.getName()); - int[] PAPERDOLL_ORDER = new int[] { Inventory.PAPERDOLL_UNDER, diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 058e1d34b0..818c38a076 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan.SubPledge; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author -Wooden- @@ -56,7 +57,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket } else if (_clan.getClanMember(LeaderId) == null) { - LOGGER.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); + PacketLogger.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); return ""; } else diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index 2d436d0a58..59ec218c84 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.RecipeData; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class RecipeItemMakeInfo implements IClientOutgoingPacket { @@ -58,7 +59,8 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeQ(0x00); return true; } - LOGGER.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); + + PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 432ff8ad7f..0a3fe46cb7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Shows the Siege Info
@@ -78,7 +79,7 @@ public class SiegeInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Null owner for castle: " + _castle.getName()); + PacketLogger.warning("Null owner for castle: " + _castle.getName()); } } else diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 44f290e92f..746b2da3f7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; @@ -157,7 +158,7 @@ public class SystemMessage implements IClientOutgoingPacket // Mobius: With additional on-screen damage param (popup), length is increased. if (param.getType() != TYPE_POPUP_ID) { - LOGGER.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); + PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } @@ -414,7 +415,7 @@ public class SystemMessage implements IClientOutgoingPacket { if (param == null) { - LOGGER.warning("Found null parameter for SystemMessageId " + _smId); + PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 37150ec357..7af1cd273c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -24,6 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class WareHouseWithdrawalList extends AbstractItemPacket { @@ -56,7 +57,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket _invSize = player.getInventory().getSize(); if (_player.getActiveWarehouse() == null) { - LOGGER.warning("error while sending withdraw request to: " + _player.getName()); + PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/PacketLogger.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/PacketLogger.java new file mode 100644 index 0000000000..5b5a083a99 --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/PacketLogger.java @@ -0,0 +1,42 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.network; + +import java.util.logging.Logger; + +/** + * @author Mobius + */ +public class PacketLogger +{ + private static final Logger LOGGER = Logger.getLogger(PacketLogger.class.getName()); + + public static synchronized void warning(String message) + { + LOGGER.warning(message); + } + + public static synchronized void info(String message) + { + LOGGER.info(message); + } + + public static synchronized void finer(String message) + { + LOGGER.finer(message); + } +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 7c343f78be..ef3f4acc18 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -161,7 +162,7 @@ public class Action implements IClientIncomingPacket default: { // Invalid action detected (probably client cheating), log this - LOGGER.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); + PacketLogger.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); client.sendPacket(ActionFailed.STATIC_PACKET); break; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index 31d29ef3dd..8e8ae2c190 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; import org.l2jmobius.gameserver.network.serverpackets.TradeOwnAdd; @@ -58,7 +59,7 @@ public class AddTradeItem implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - LOGGER.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); + PacketLogger.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); return; } @@ -68,7 +69,7 @@ public class AddTradeItem implements IClientIncomingPacket // Trade partner not found, cancel trade if (partner != null) { - LOGGER.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); + PacketLogger.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); } player.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE); player.cancelActiveTrade(); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 20134dd2bb..a3236b0d83 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -62,7 +62,7 @@ public class CannotMoveAnymore implements IClientIncomingPacket // player.stopMove(); // // if (Config.DEBUG) - // LOGGER.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ + // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); // StopMove smwl = new StopMove(player); // client.getPlayer().sendPacket(smwl); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index e25524223a..0b6571d963 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -43,6 +43,7 @@ import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; import org.l2jmobius.gameserver.network.serverpackets.CharCreateOk; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -124,21 +125,21 @@ public class CharacterCreate implements IClientIncomingPacket if ((_face > 2) || (_face < 0)) { - LOGGER.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairStyle < 0) || ((_sex == 0) && (_hairStyle > 4)) || ((_sex != 0) && (_hairStyle > 6))) { - LOGGER.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairColor > 3) || (_hairColor < 0)) { - LOGGER.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } @@ -303,7 +304,7 @@ public class CharacterCreate implements IClientIncomingPacket final Item item = newChar.getInventory().addItem("Init", ie.getId(), ie.getCount(), newChar, null); if (item == null) { - LOGGER.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); + PacketLogger.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); continue; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java index 86c425fa45..63c3261946 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Level; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.CharacterDeleteFailType; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -25,6 +23,7 @@ import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDelete; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteFail; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteSuccess; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -74,7 +73,7 @@ public class CharacterDelete implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Error:", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1, 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java index 5f74c38273..cfe9b20f3d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java @@ -47,7 +47,7 @@ public class EndScenePlayer implements IClientIncomingPacket final MovieHolder holder = player.getMovieHolder(); if ((holder == null) || (holder.getMovie().getClientId() != _movieId)) { - // LOGGER.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); + // PacketLogger.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index abc244ddcd..e640f6074d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -68,6 +68,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.Die; @@ -152,7 +153,7 @@ public class EnterWorld implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.warning("EnterWorld failed! player returned 'null'."); + PacketLogger.warning("EnterWorld failed! player returned 'null'."); Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java index 8bde20da0a..14e8153478 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java @@ -25,9 +25,13 @@ import org.l2jmobius.gameserver.network.GameClient; */ public class ExGetOnAirShip implements IClientIncomingPacket { + @SuppressWarnings("unused") private int _x; + @SuppressWarnings("unused") private int _y; + @SuppressWarnings("unused") private int _z; + @SuppressWarnings("unused") private int _shipId; @Override @@ -43,9 +47,9 @@ public class ExGetOnAirShip implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("[T1:ExGetOnAirShip] x: " + _x); - LOGGER.info("[T1:ExGetOnAirShip] y: " + _y); - LOGGER.info("[T1:ExGetOnAirShip] z: " + _z); - LOGGER.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); + // PacketLogger.info("[T1:ExGetOnAirShip] x: " + _x); + // PacketLogger.info("[T1:ExGetOnAirShip] y: " + _y); + // PacketLogger.info("[T1:ExGetOnAirShip] z: " + _z); + // PacketLogger.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java index fcdd8335f4..4e91188f5c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java @@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Arrays; -import java.util.logging.Level; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: c dddd @@ -79,7 +79,7 @@ public class GameGuardReply implements IClientIncomingPacket } catch (NoSuchAlgorithmException e) { - LOGGER.log(Level.WARNING, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java index eddff9f891..62e69acd86 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.gameserver.network.GameClient; @@ -27,5 +25,4 @@ import org.l2jmobius.gameserver.network.GameClient; */ public interface IClientIncomingPacket extends IIncomingPacket { - Logger LOGGER = Logger.getLogger(IClientIncomingPacket.class.getName()); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index ea86074f0e..91a2b46047 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -153,7 +154,7 @@ public class MultiSellChoose implements IClientIncomingPacket if (((_soulCrystalOptions != null) && CommonUtil.contains(_soulCrystalOptions, null)) || ((_soulCrystalSpecialOptions != null) && CommonUtil.contains(_soulCrystalSpecialOptions, null))) { - LOGGER.severe("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -161,14 +162,14 @@ public class MultiSellChoose implements IClientIncomingPacket final MultisellEntryHolder entry = list.getEntries().get(_entryId - 1); // Entry Id begins from 1. We currently use entry IDs as index pointer. if (entry == null) { - LOGGER.severe("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } if (!entry.isStackable() && (_amount > 1)) { - LOGGER.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -196,7 +197,7 @@ public class MultiSellChoose implements IClientIncomingPacket )) //@formatter:on { - LOGGER.severe("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -368,7 +369,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); return; } } @@ -478,7 +479,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); return; } } @@ -673,7 +674,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); + PacketLogger.warning("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); return false; } } 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 d45797c8d9..ac4d13ece2 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 @@ -45,6 +45,7 @@ import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillDone; import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; @@ -105,7 +106,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if ((_level < 1) || (_level > 1000) || (_id < 1) || (_id > 64000)) { Util.handleIllegalPlayerAction(player, "Wrong Packet Data in Aquired Skill", Config.DEFAULT_PUNISH); - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); return; } @@ -119,7 +120,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - LOGGER.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -498,7 +499,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket } default: { - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); break; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 0a570fd3ef..4bb789645a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillInfo; import org.l2jmobius.gameserver.network.serverpackets.ExAcquireSkillInfo; @@ -55,7 +56,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket { if ((_id <= 0) || (_level <= 0)) { - LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); return; } @@ -74,7 +75,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level); if (skill == null) { - LOGGER.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); + PacketLogger.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); return; } 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 5e0a2af0c9..8078d0c10e 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.Arrays; -import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.ActionData; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; @@ -41,8 +41,6 @@ import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList; */ public class RequestActionUse implements IClientIncomingPacket { - private static final Logger LOGGER = Logger.getLogger(RequestActionUse.class.getName()); - private int _actionId; private boolean _ctrlPressed; private boolean _shiftPressed; @@ -93,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } @@ -107,7 +105,7 @@ public class RequestActionUse implements IClientIncomingPacket actionHandler.useAction(player, actionHolder, _ctrlPressed, _shiftPressed); return; } - LOGGER.warning("Couldnt find handler with name: " + actionHolder.getHandler()); + PacketLogger.warning("Couldn't find handler with name: " + actionHolder.getHandler()); return; } @@ -143,7 +141,7 @@ public class RequestActionUse implements IClientIncomingPacket } default: { - LOGGER.warning(player.getName() + ": unhandled action type " + _actionId); + PacketLogger.warning(player.getName() + ": unhandled action type " + _actionId); break; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java index 1fa1214bea..76649875f1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.data.xml.FakePlayerData; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -130,7 +131,7 @@ public class RequestBlock implements IClientIncomingPacket } default: { - LOGGER.info("Unknown 0xA9 block type: " + _type); + PacketLogger.info("Unknown 0xA9 block type: " + _type); } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index eb7e62ebf2..ce3d851f06 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -161,7 +162,7 @@ public class RequestBuyItem implements IClientIncomingPacket long price = product.getPrice(); if (price < 0) { - LOGGER.warning("ERROR, no price found .. wrong buylist ??"); + PacketLogger.warning("ERROR, no price found .. wrong buylist ??"); client.sendPacket(ActionFailed.STATIC_PACKET); 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 a7e3f28ed6..dd5c90fce2 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.StringTokenizer; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -41,6 +40,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -88,7 +88,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -192,7 +192,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (NumberFormatException nfe) { - LOGGER.log(Level.WARNING, "NFE for command [" + _command + "]", nfe); + PacketLogger.warning("NFE for command [" + _command + "] " + nfe.getMessage()); } } else if (_command.startsWith("_match")) @@ -284,13 +284,13 @@ public class RequestBypassToServer implements IClientIncomingPacket } else { - LOGGER.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); + PacketLogger.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); } } } catch (Exception e) { - LOGGER.log(Level.WARNING, "Exception processing bypass from player " + player.getName() + ": " + _command, e); + PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _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/RequestCrystallizeItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index af45d9defb..03d610fe78 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -59,7 +60,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.finer("RequestCrystalizeItem: activeChar was null"); + // PacketLogger.finer("RequestCrystalizeItem: activeChar was null."); return; } @@ -87,7 +88,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - LOGGER.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index a99d5fcb63..1e735c8742 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; @@ -33,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -169,7 +169,7 @@ public class RequestDestroyItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not delete pet objectid: ", e); + PacketLogger.warning("Could not delete pet objectid: " + e.getMessage()); } } if (itemToRemove.isTimeLimitedItem()) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 0e4b623bb3..b7d4ac63a9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.GMAudit; import org.l2jmobius.gameserver.util.Util; @@ -210,7 +211,7 @@ public class RequestDropItem implements IClientIncomingPacket if ((dropedItem != null) && (dropedItem.getId() == Inventory.ADENA_ID) && (dropedItem.getCount() >= 1000000)) { final String msg = "Character (" + player.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")"; - LOGGER.warning(msg); + PacketLogger.warning(msg); AdminData.getInstance().broadcastMessageToGMs(msg); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java index e3ab837779..e8bfc249c9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ExNeedToChangeName; /** @@ -42,6 +43,6 @@ public class RequestExChangeName implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); + PacketLogger.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java index 6e4861568e..c2f02f89ad 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chdd d: Arena d: Team @@ -74,7 +75,7 @@ public class RequestExCubeGameChangeTeam implements IClientIncomingPacket } default: { - LOGGER.warning("Wrong Cube Game Team ID: " + _team); + PacketLogger.warning("Wrong Cube Game Team ID: " + _team); break; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java index 009b836b6d..d72fdfc413 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chddd d: Arena d: Answer @@ -64,7 +65,7 @@ public class RequestExCubeGameReadyAnswer implements IClientIncomingPacket } default: { - LOGGER.warning("Unknown Cube Game Answer ID: " + _answer); + PacketLogger.warning("Unknown Cube Game Answer ID: " + _answer); break; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java index ff12adb20d..3347f01941 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) just a trigger @@ -34,6 +35,6 @@ public class RequestExFishRanking implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestExFishRanking"); + PacketLogger.info("C5: RequestExFishRanking"); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 57e8e7d2e5..8851aef463 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; import org.l2jmobius.gameserver.util.Broadcast; @@ -86,7 +87,7 @@ public class RequestExMagicSkillUseGround implements IClientIncomingPacket else { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("No skill found with id " + _skillId + " and level " + level + " !!"); + PacketLogger.warning("No skill found with id " + _skillId + " and level " + level + " !!"); } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 77093c5f2d..2d9f0456f4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; @@ -73,7 +74,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket client.sendPacket(new ExPutEnchantTargetItemResult(0)); if (scrollTemplate == null) { - LOGGER.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); + PacketLogger.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); } return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java index 05e09e6dfc..0a4522bf64 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressMapInfo; @@ -43,7 +44,7 @@ public class RequestFortressMapInfo implements IClientIncomingPacket final Fort fort = FortManager.getInstance().getFortById(_fortressId); if (fort == null) { - LOGGER.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); + PacketLogger.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); if (client.getPlayer() == null) { 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 f65a63d325..dc903790d0 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 @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) d @@ -44,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - LOGGER.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning("Player " + 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/RequestGetItemFromPet.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index a9fd8d923a..48e75fc61b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.util.Util; @@ -84,7 +85,7 @@ public class RequestGetItemFromPet implements IClientIncomingPacket } else { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 79e1193ac0..22f2f24422 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.util.Util; @@ -124,7 +125,7 @@ public class RequestGiveItemToPet implements IClientIncomingPacket } else { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } 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 d0add3fa49..04abcbce46 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 @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaEquipList; @@ -67,7 +68,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.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 fa21b68043..a7c019d65d 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; @@ -52,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - LOGGER.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); } client.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 b943775334..ff96a400c9 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; @@ -50,10 +51,11 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.sendPacket(ActionFailed.STATIC_PACKET); return; } + player.sendPacket(new HennaItemRemoveInfo(henna, player)); } } 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 ab9f0c33f7..89e11ba6a9 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -75,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); client.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 53f04488a6..ada67e190c 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -49,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - LOGGER.warning("Player " + actor.getName() + " sent empty html link!"); + PacketLogger.warning("Player " + actor.getName() + " sent empty html link!"); return; } if (_link.contains("..")) { - LOGGER.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); return; } final int htmlObjectId = actor.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - LOGGER.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java index 89adeae67b..2e1c1c83f6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author UnAfraid @@ -51,7 +52,7 @@ public class RequestMagicSkillList implements IClientIncomingPacket if (player.getObjectId() != _objectId) { - LOGGER.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); + PacketLogger.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 9432941937..a228079092 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -64,7 +64,7 @@ public class RequestMagicSkillUse implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); // if (_magicId > 0) // { - // LOGGER.warning("Skill Id " + _magicId + " not found in player: " + player); + // PacketLogger.warning("Skill Id " + _magicId + " not found in player: " + player); // } return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 5fbcac0eca..9149ce1284 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListDelete; @@ -71,7 +72,7 @@ public class RequestOustPledgeMember implements IClientIncomingPacket final ClanMember member = clan.getClanMember(_target); if (member == null) { - LOGGER.warning("Target (" + _target + ") is not member of the clan"); + PacketLogger.warning("Target (" + _target + ") is not member of the clan"); return; } if (member.isOnline() && member.getPlayer().isInCombat()) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java index 9702554c3b..209835b319 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) S @@ -37,6 +38,6 @@ public class RequestPCCafeCouponUse implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestPCCafeCouponUse: S: " + _str); + PacketLogger.info("C5: RequestPCCafeCouponUse: S: " + _str); } } 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 7da966ce9f..2cd9c6a8d1 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 @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -120,7 +121,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item item = player.checkItemManipulation(i.getId(), i.getCount(), "freight"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); warehouse.deleteMe(); return; } @@ -169,7 +170,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); warehouse.deleteMe(); return; } @@ -177,7 +178,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem("Trade", i.getId(), i.getCount(), warehouse, player, null); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 2c715b4efb..0d858fb452 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -137,7 +138,7 @@ public class RequestPetUseItem implements IClientIncomingPacket else { player.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM); - LOGGER.warning("No item handler registered for itemId: " + item.getId()); + PacketLogger.warning("No item handler registered for itemId: " + item.getId()); } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index 8ece2b3ec7..fec0dc36a0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -25,6 +25,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Plim @@ -74,7 +75,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket } catch (SQLException e) { - LOGGER.severe("Error while saving petition feedback"); + PacketLogger.warning("Error while saving petition feedback."); } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java index d212481717..3459b04c80 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java @@ -44,8 +44,8 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket @Override public void run(GameClient client) { - // LOGGER.info("C5: RequestPledgeMemberInfo d:"+_unk1); - // LOGGER.info("C5: RequestPledgeMemberInfo S:"+_player); + // PacketLogger.info("C5: RequestPledgeMemberInfo d:"+_unk1); + // PacketLogger.info("C5: RequestPledgeMemberInfo S:"+_player); final Player player = client.getPlayer(); if (player == null) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index e56c105cf4..44bbd9d34c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.HashMap; import java.util.Map; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -38,6 +37,7 @@ import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; @@ -74,7 +74,7 @@ public class RequestPreviewItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } @@ -152,7 +152,7 @@ public class RequestPreviewItem implements IClientIncomingPacket final Merchant merchant = (target instanceof Merchant) ? (Merchant) target : null; if (merchant == null) { - LOGGER.warning("Null merchant!"); + PacketLogger.warning(getClass().getSimpleName() + ": Null merchant!"); 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 251757c0ba..94958bc4fe 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.util.Util; @@ -145,7 +146,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if (result > 1) { - LOGGER.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); } return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java index 9998465898..8ab3d4962f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; public class RequestPrivateStoreSell implements IClientIncomingPacket @@ -134,7 +135,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket if (!storeList.privateStoreSell(player, _items)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index a4010ca2cb..1632df189f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -193,7 +194,7 @@ public class RequestRefundItem implements IClientIncomingPacket final Item item = player.getRefund().transferItem("Refund", objectIds[i], Long.MAX_VALUE, player.getInventory(), player, player.getLastFolkNPC()); if (item == null) { - LOGGER.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index ee78579ea4..8a2f42272a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket { @@ -54,7 +55,7 @@ public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket } else { - LOGGER.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); + PacketLogger.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); } player.onTransactionRequest(requestor); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index afc4e65df4..08ad2c7763 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @version $Revision: 1.7.2.3.2.6 $ $Date: 2005/03/27 15:29:30 $ @@ -139,7 +140,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if ((player.getClan() == null) || (player.getClan().getHideoutId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.CLANHALL); @@ -167,7 +168,7 @@ public class RequestRestartPoint implements IClientIncomingPacket } else { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); return; } } @@ -199,7 +200,7 @@ public class RequestRestartPoint implements IClientIncomingPacket final Clan clan = player.getClan(); if ((clan == null) || (clan.getFortId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.FORTRESS); @@ -231,7 +232,7 @@ public class RequestRestartPoint implements IClientIncomingPacket if (((siegeClan == null) || siegeClan.getFlag().isEmpty())) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.SIEGEFLAG); @@ -241,7 +242,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if (!player.isGM() && !player.getInventory().haveItemForSelfResurrection()) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); return; } if (player.isGM() || player.destroyItemByItemId("Feather", 10649, 1, player, false) || player.destroyItemByItemId("Feather", 13300, 1, player, false) || player.destroyItemByItemId("Feather", 13128, 1, player, false)) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index ecb0ab9738..9f217064bb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExNoticePostSent; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -316,14 +317,14 @@ public class RequestSendPost implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getObjectId(), i.getCount(), "attach"); if ((oldItem == null) || !oldItem.isTradeable() || oldItem.isEquipped()) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); return false; } final Item newItem = player.getInventory().transferItem("SendMail", i.getObjectId(), i.getCount(), attachments, player, msg.getReceiverName() + "[" + msg.getReceiverId() + "]"); if (newItem == null) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java index 2a33016c9a..b5d130046c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -54,16 +55,16 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket final Castle castle = CastleManager.getInstance().getCastleById(_castleId); if ((player == null) || (castle == null)) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); return; } if ((castle.getOwnerId() > 0) && (castle.getOwnerId() != player.getClanId())) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); } else if (!player.isClanLeader()) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); } else if (!castle.isTimeRegistrationOver()) { @@ -79,12 +80,12 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); } } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); } } 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 6d1eea218a..c600906d81 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 @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; @@ -108,7 +109,7 @@ public class Say2 implements IClientIncomingPacket ChatType chatType = ChatType.findByClientId(_type); if (chatType == null) { - LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); + PacketLogger.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -116,7 +117,7 @@ public class Say2 implements IClientIncomingPacket if (_text.isEmpty()) { - LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); + PacketLogger.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -210,7 +211,7 @@ public class Say2 implements IClientIncomingPacket } else { - LOGGER.info("No handler registered for ChatType: " + _type + " Player: " + client); + PacketLogger.info("No handler registered for ChatType: " + _type + " Player: " + client); } } @@ -256,7 +257,7 @@ public class Say2 implements IClientIncomingPacket final Item item = owner.getInventory().getItemByObjectId(id); if (item == null) { - LOGGER.info(client + " trying publish item which doesnt own! ID:" + id); + PacketLogger.info(client + " trying publish item which doesnt own! ID:" + id); return false; } item.publish(); @@ -264,7 +265,7 @@ public class Say2 implements IClientIncomingPacket pos1 = _text.indexOf(8, pos) + 1; if (pos1 == 0) // missing ending tag { - LOGGER.info(client + " sent invalid publish item msg! ID:" + id); + PacketLogger.info(client + " sent invalid publish item msg! ID:" + id); return false; } } 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 f89be1cfcb..84b879e0f7 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 @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -127,7 +128,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item item = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); return; } @@ -174,7 +175,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } @@ -186,7 +187,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem(warehouse.getName(), itemHolder.getId(), itemHolder.getCount(), warehouse, player, manager); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 1840fcded7..647761584a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; @@ -163,13 +164,13 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket final Item oldItem = warehouse.getItemByObjectId(i.getId()); if ((oldItem == null) || (oldItem.getCount() < i.getCount())) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } final Item newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, manager); if (newItem == null) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); return; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 1e392c2ff7..55bf4c7f64 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -43,6 +43,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUseSharedGroupItem; @@ -280,7 +281,7 @@ public class UseItem implements IClientIncomingPacket { if ((etcItem != null) && (etcItem.getHandlerName() != null)) { - LOGGER.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); + PacketLogger.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); } } else if (handler.useItem(player, item, _ctrlPressed)) 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 20d84a2bd6..6b2f96e87d 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; @@ -60,37 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - LOGGER.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 30% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 100% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - LOGGER.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - - LOGGER.warning("Player " + player + ": Auction House (15-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); return; - } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - LOGGER.warning("Player " + player + ": Auction House (30-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + 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/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index b4b5bd9011..e4e46a5271 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -94,7 +95,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning(player + ": tried to crystallize " + item.getItem()); + PacketLogger.warning(player + ": tried to crystallize " + item.getItem()); return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index 999f5b7619..d8a8f85043 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward; @@ -62,7 +63,7 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { - LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); + PacketLogger.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java index b12c280c6d..635799d26b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java @@ -18,12 +18,12 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -102,7 +102,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e); + PacketLogger.warning("Could not add friend objectid: " + e.getMessage()); } } else diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java index 2dad174d89..73cd9a6a4b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -26,6 +25,7 @@ import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -99,7 +99,7 @@ public class RequestFriendDel implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not del friend objectid: ", e); + PacketLogger.warning("Could not del friend objectid: " + e.getMessage()); } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index 8a327f1f9c..ff61b200fb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.mentoring; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMenteeAdd; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -93,7 +93,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, e.getMessage(), e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java index 18445bd1c5..679dd76226 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.model.clan.ClanRewardBonus; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -77,7 +78,7 @@ public class RequestPledgeBonusReward implements IClientIncomingPacket } else { - LOGGER.warning(player + " Attempting to claim reward but clan(" + clan + ") doesn't have such!"); + PacketLogger.warning(player + " Attempting to claim reward but clan(" + clan + ") doesn't have such!"); } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java index ee8910d06e..a53878b794 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductList; @@ -60,7 +61,7 @@ public class RequestBRProductList implements IClientIncomingPacket } default: { - LOGGER.warning(player + " send unhandled product list type: " + _type); + PacketLogger.warning(player + " send unhandled product list type: " + _type); break; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java index e1eb0d88df..00a18163da 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.SayuneRequest; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.type.SayuneZone; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; @@ -72,7 +73,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (zone.getMapId() == -1) { player.sendMessage("That zone is not supported yet!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); return; } @@ -80,7 +81,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (map == null) { player.sendMessage("This zone is not handled yet!!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java index f1ede4ef0a..41648f184f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Shuttle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -60,7 +61,7 @@ public class RequestShuttleGetOn implements IClientIncomingPacket player.getInVehiclePosition().setXYZ(_x, _y, _z); break; } - LOGGER.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); + PacketLogger.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 33eeff5060..1b8ddb2042 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -16,11 +16,10 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Level; - import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.util.Util; /** @@ -75,7 +74,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { if (html.length() > 17200) { - LOGGER.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable()); + PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } @@ -94,7 +93,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket if (content == null) { setHtml("My Text is missing:
" + path + ""); - LOGGER.warning("missing html page " + path); + PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index e6b4b8b604..57ed88ac29 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; /** @@ -46,7 +47,7 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index d94dbf4403..75f6596194 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Migi, DS @@ -44,7 +45,7 @@ public class ExReplySentPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index b0f3738683..15d011befc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author KenM @@ -54,7 +55,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); + PacketLogger.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); packet.writeS(""); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index d588f1c7cf..b5c8628b50 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IOutgoingPacket; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; @@ -28,8 +26,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; */ public interface IClientOutgoingPacket extends IOutgoingPacket { - Logger LOGGER = Logger.getLogger(IClientOutgoingPacket.class.getName()); - int[] PAPERDOLL_ORDER = new int[] { Inventory.PAPERDOLL_UNDER, diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 058e1d34b0..818c38a076 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan.SubPledge; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author -Wooden- @@ -56,7 +57,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket } else if (_clan.getClanMember(LeaderId) == null) { - LOGGER.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); + PacketLogger.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); return ""; } else diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index 2d436d0a58..59ec218c84 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.RecipeData; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class RecipeItemMakeInfo implements IClientOutgoingPacket { @@ -58,7 +59,8 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeQ(0x00); return true; } - LOGGER.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); + + PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 432ff8ad7f..0a3fe46cb7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Shows the Siege Info
@@ -78,7 +79,7 @@ public class SiegeInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Null owner for castle: " + _castle.getName()); + PacketLogger.warning("Null owner for castle: " + _castle.getName()); } } else diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 4ed2ccc9b6..55902e07e1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; @@ -158,7 +159,7 @@ public class SystemMessage implements IClientOutgoingPacket // Mobius: With additional on-screen damage param (popup), length is increased. if (param.getType() != TYPE_POPUP_ID) { - LOGGER.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); + PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } @@ -421,7 +422,7 @@ public class SystemMessage implements IClientOutgoingPacket { if (param == null) { - LOGGER.warning("Found null parameter for SystemMessageId " + _smId); + PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 37150ec357..7af1cd273c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -24,6 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class WareHouseWithdrawalList extends AbstractItemPacket { @@ -56,7 +57,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket _invSize = player.getInventory().getSize(); if (_player.getActiveWarehouse() == null) { - LOGGER.warning("error while sending withdraw request to: " + _player.getName()); + PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/PacketLogger.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/PacketLogger.java new file mode 100644 index 0000000000..5b5a083a99 --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/PacketLogger.java @@ -0,0 +1,42 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.network; + +import java.util.logging.Logger; + +/** + * @author Mobius + */ +public class PacketLogger +{ + private static final Logger LOGGER = Logger.getLogger(PacketLogger.class.getName()); + + public static synchronized void warning(String message) + { + LOGGER.warning(message); + } + + public static synchronized void info(String message) + { + LOGGER.info(message); + } + + public static synchronized void finer(String message) + { + LOGGER.finer(message); + } +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 7c343f78be..ef3f4acc18 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -161,7 +162,7 @@ public class Action implements IClientIncomingPacket default: { // Invalid action detected (probably client cheating), log this - LOGGER.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); + PacketLogger.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); client.sendPacket(ActionFailed.STATIC_PACKET); break; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index 31d29ef3dd..8e8ae2c190 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; import org.l2jmobius.gameserver.network.serverpackets.TradeOwnAdd; @@ -58,7 +59,7 @@ public class AddTradeItem implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - LOGGER.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); + PacketLogger.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); return; } @@ -68,7 +69,7 @@ public class AddTradeItem implements IClientIncomingPacket // Trade partner not found, cancel trade if (partner != null) { - LOGGER.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); + PacketLogger.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); } player.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE); player.cancelActiveTrade(); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 20134dd2bb..a3236b0d83 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -62,7 +62,7 @@ public class CannotMoveAnymore implements IClientIncomingPacket // player.stopMove(); // // if (Config.DEBUG) - // LOGGER.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ + // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); // StopMove smwl = new StopMove(player); // client.getPlayer().sendPacket(smwl); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index e25524223a..0b6571d963 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -43,6 +43,7 @@ import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; import org.l2jmobius.gameserver.network.serverpackets.CharCreateOk; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -124,21 +125,21 @@ public class CharacterCreate implements IClientIncomingPacket if ((_face > 2) || (_face < 0)) { - LOGGER.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairStyle < 0) || ((_sex == 0) && (_hairStyle > 4)) || ((_sex != 0) && (_hairStyle > 6))) { - LOGGER.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairColor > 3) || (_hairColor < 0)) { - LOGGER.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } @@ -303,7 +304,7 @@ public class CharacterCreate implements IClientIncomingPacket final Item item = newChar.getInventory().addItem("Init", ie.getId(), ie.getCount(), newChar, null); if (item == null) { - LOGGER.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); + PacketLogger.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); continue; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java index 86c425fa45..63c3261946 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Level; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.CharacterDeleteFailType; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -25,6 +23,7 @@ import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDelete; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteFail; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteSuccess; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -74,7 +73,7 @@ public class CharacterDelete implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Error:", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1, 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java index 5f74c38273..cfe9b20f3d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java @@ -47,7 +47,7 @@ public class EndScenePlayer implements IClientIncomingPacket final MovieHolder holder = player.getMovieHolder(); if ((holder == null) || (holder.getMovie().getClientId() != _movieId)) { - // LOGGER.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); + // PacketLogger.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index abc244ddcd..e640f6074d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -68,6 +68,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.Die; @@ -152,7 +153,7 @@ public class EnterWorld implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.warning("EnterWorld failed! player returned 'null'."); + PacketLogger.warning("EnterWorld failed! player returned 'null'."); Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java index 8bde20da0a..14e8153478 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java @@ -25,9 +25,13 @@ import org.l2jmobius.gameserver.network.GameClient; */ public class ExGetOnAirShip implements IClientIncomingPacket { + @SuppressWarnings("unused") private int _x; + @SuppressWarnings("unused") private int _y; + @SuppressWarnings("unused") private int _z; + @SuppressWarnings("unused") private int _shipId; @Override @@ -43,9 +47,9 @@ public class ExGetOnAirShip implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("[T1:ExGetOnAirShip] x: " + _x); - LOGGER.info("[T1:ExGetOnAirShip] y: " + _y); - LOGGER.info("[T1:ExGetOnAirShip] z: " + _z); - LOGGER.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); + // PacketLogger.info("[T1:ExGetOnAirShip] x: " + _x); + // PacketLogger.info("[T1:ExGetOnAirShip] y: " + _y); + // PacketLogger.info("[T1:ExGetOnAirShip] z: " + _z); + // PacketLogger.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java index fcdd8335f4..4e91188f5c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java @@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Arrays; -import java.util.logging.Level; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: c dddd @@ -79,7 +79,7 @@ public class GameGuardReply implements IClientIncomingPacket } catch (NoSuchAlgorithmException e) { - LOGGER.log(Level.WARNING, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java index eddff9f891..62e69acd86 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.gameserver.network.GameClient; @@ -27,5 +25,4 @@ import org.l2jmobius.gameserver.network.GameClient; */ public interface IClientIncomingPacket extends IIncomingPacket { - Logger LOGGER = Logger.getLogger(IClientIncomingPacket.class.getName()); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index ea86074f0e..91a2b46047 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -153,7 +154,7 @@ public class MultiSellChoose implements IClientIncomingPacket if (((_soulCrystalOptions != null) && CommonUtil.contains(_soulCrystalOptions, null)) || ((_soulCrystalSpecialOptions != null) && CommonUtil.contains(_soulCrystalSpecialOptions, null))) { - LOGGER.severe("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -161,14 +162,14 @@ public class MultiSellChoose implements IClientIncomingPacket final MultisellEntryHolder entry = list.getEntries().get(_entryId - 1); // Entry Id begins from 1. We currently use entry IDs as index pointer. if (entry == null) { - LOGGER.severe("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } if (!entry.isStackable() && (_amount > 1)) { - LOGGER.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -196,7 +197,7 @@ public class MultiSellChoose implements IClientIncomingPacket )) //@formatter:on { - LOGGER.severe("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -368,7 +369,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); return; } } @@ -478,7 +479,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); return; } } @@ -673,7 +674,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); + PacketLogger.warning("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); return false; } } 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 d45797c8d9..ac4d13ece2 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 @@ -45,6 +45,7 @@ import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillDone; import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; @@ -105,7 +106,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if ((_level < 1) || (_level > 1000) || (_id < 1) || (_id > 64000)) { Util.handleIllegalPlayerAction(player, "Wrong Packet Data in Aquired Skill", Config.DEFAULT_PUNISH); - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); return; } @@ -119,7 +120,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - LOGGER.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -498,7 +499,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket } default: { - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); break; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 0a570fd3ef..4bb789645a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillInfo; import org.l2jmobius.gameserver.network.serverpackets.ExAcquireSkillInfo; @@ -55,7 +56,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket { if ((_id <= 0) || (_level <= 0)) { - LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); return; } @@ -74,7 +75,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level); if (skill == null) { - LOGGER.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); + PacketLogger.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); return; } 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 5e0a2af0c9..8078d0c10e 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.Arrays; -import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.ActionData; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; @@ -41,8 +41,6 @@ import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList; */ public class RequestActionUse implements IClientIncomingPacket { - private static final Logger LOGGER = Logger.getLogger(RequestActionUse.class.getName()); - private int _actionId; private boolean _ctrlPressed; private boolean _shiftPressed; @@ -93,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } @@ -107,7 +105,7 @@ public class RequestActionUse implements IClientIncomingPacket actionHandler.useAction(player, actionHolder, _ctrlPressed, _shiftPressed); return; } - LOGGER.warning("Couldnt find handler with name: " + actionHolder.getHandler()); + PacketLogger.warning("Couldn't find handler with name: " + actionHolder.getHandler()); return; } @@ -143,7 +141,7 @@ public class RequestActionUse implements IClientIncomingPacket } default: { - LOGGER.warning(player.getName() + ": unhandled action type " + _actionId); + PacketLogger.warning(player.getName() + ": unhandled action type " + _actionId); break; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java index 1fa1214bea..76649875f1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.data.xml.FakePlayerData; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -130,7 +131,7 @@ public class RequestBlock implements IClientIncomingPacket } default: { - LOGGER.info("Unknown 0xA9 block type: " + _type); + PacketLogger.info("Unknown 0xA9 block type: " + _type); } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index eb7e62ebf2..ce3d851f06 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -161,7 +162,7 @@ public class RequestBuyItem implements IClientIncomingPacket long price = product.getPrice(); if (price < 0) { - LOGGER.warning("ERROR, no price found .. wrong buylist ??"); + PacketLogger.warning("ERROR, no price found .. wrong buylist ??"); client.sendPacket(ActionFailed.STATIC_PACKET); 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 a7e3f28ed6..dd5c90fce2 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.StringTokenizer; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -41,6 +40,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -88,7 +88,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -192,7 +192,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (NumberFormatException nfe) { - LOGGER.log(Level.WARNING, "NFE for command [" + _command + "]", nfe); + PacketLogger.warning("NFE for command [" + _command + "] " + nfe.getMessage()); } } else if (_command.startsWith("_match")) @@ -284,13 +284,13 @@ public class RequestBypassToServer implements IClientIncomingPacket } else { - LOGGER.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); + PacketLogger.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); } } } catch (Exception e) { - LOGGER.log(Level.WARNING, "Exception processing bypass from player " + player.getName() + ": " + _command, e); + PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _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/RequestCrystallizeItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index f3d775a15b..be08d7f35d 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -59,7 +60,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.finer("RequestCrystalizeItem: activeChar was null"); + // PacketLogger.finer("RequestCrystalizeItem: activeChar was null."); return; } @@ -87,7 +88,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - LOGGER.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 4f351a636b..cb90d581c8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; @@ -33,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -169,7 +169,7 @@ public class RequestDestroyItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not delete pet objectid: ", e); + PacketLogger.warning("Could not delete pet objectid: " + e.getMessage()); } } if (itemToRemove.isTimeLimitedItem()) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 0e4b623bb3..b7d4ac63a9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.GMAudit; import org.l2jmobius.gameserver.util.Util; @@ -210,7 +211,7 @@ public class RequestDropItem implements IClientIncomingPacket if ((dropedItem != null) && (dropedItem.getId() == Inventory.ADENA_ID) && (dropedItem.getCount() >= 1000000)) { final String msg = "Character (" + player.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")"; - LOGGER.warning(msg); + PacketLogger.warning(msg); AdminData.getInstance().broadcastMessageToGMs(msg); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java index e3ab837779..e8bfc249c9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ExNeedToChangeName; /** @@ -42,6 +43,6 @@ public class RequestExChangeName implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); + PacketLogger.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java index 6e4861568e..c2f02f89ad 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chdd d: Arena d: Team @@ -74,7 +75,7 @@ public class RequestExCubeGameChangeTeam implements IClientIncomingPacket } default: { - LOGGER.warning("Wrong Cube Game Team ID: " + _team); + PacketLogger.warning("Wrong Cube Game Team ID: " + _team); break; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java index 009b836b6d..d72fdfc413 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chddd d: Arena d: Answer @@ -64,7 +65,7 @@ public class RequestExCubeGameReadyAnswer implements IClientIncomingPacket } default: { - LOGGER.warning("Unknown Cube Game Answer ID: " + _answer); + PacketLogger.warning("Unknown Cube Game Answer ID: " + _answer); break; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java index ff12adb20d..3347f01941 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) just a trigger @@ -34,6 +35,6 @@ public class RequestExFishRanking implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestExFishRanking"); + PacketLogger.info("C5: RequestExFishRanking"); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 57e8e7d2e5..8851aef463 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; import org.l2jmobius.gameserver.util.Broadcast; @@ -86,7 +87,7 @@ public class RequestExMagicSkillUseGround implements IClientIncomingPacket else { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("No skill found with id " + _skillId + " and level " + level + " !!"); + PacketLogger.warning("No skill found with id " + _skillId + " and level " + level + " !!"); } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 77093c5f2d..2d9f0456f4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; @@ -73,7 +74,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket client.sendPacket(new ExPutEnchantTargetItemResult(0)); if (scrollTemplate == null) { - LOGGER.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); + PacketLogger.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); } return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java index 05e09e6dfc..0a4522bf64 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressMapInfo; @@ -43,7 +44,7 @@ public class RequestFortressMapInfo implements IClientIncomingPacket final Fort fort = FortManager.getInstance().getFortById(_fortressId); if (fort == null) { - LOGGER.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); + PacketLogger.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); if (client.getPlayer() == null) { 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 f65a63d325..dc903790d0 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 @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) d @@ -44,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - LOGGER.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning("Player " + 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/RequestGetItemFromPet.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index a9fd8d923a..48e75fc61b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.util.Util; @@ -84,7 +85,7 @@ public class RequestGetItemFromPet implements IClientIncomingPacket } else { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 79e1193ac0..22f2f24422 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.util.Util; @@ -124,7 +125,7 @@ public class RequestGiveItemToPet implements IClientIncomingPacket } else { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } 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 d0add3fa49..04abcbce46 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 @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaEquipList; @@ -67,7 +68,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.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 fa21b68043..a7c019d65d 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; @@ -52,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - LOGGER.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); } client.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 b943775334..ff96a400c9 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; @@ -50,10 +51,11 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.sendPacket(ActionFailed.STATIC_PACKET); return; } + player.sendPacket(new HennaItemRemoveInfo(henna, player)); } } 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 ab9f0c33f7..89e11ba6a9 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -75,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); client.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 53f04488a6..ada67e190c 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -49,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - LOGGER.warning("Player " + actor.getName() + " sent empty html link!"); + PacketLogger.warning("Player " + actor.getName() + " sent empty html link!"); return; } if (_link.contains("..")) { - LOGGER.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); return; } final int htmlObjectId = actor.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - LOGGER.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java index 89adeae67b..2e1c1c83f6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author UnAfraid @@ -51,7 +52,7 @@ public class RequestMagicSkillList implements IClientIncomingPacket if (player.getObjectId() != _objectId) { - LOGGER.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); + PacketLogger.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 9432941937..a228079092 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -64,7 +64,7 @@ public class RequestMagicSkillUse implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); // if (_magicId > 0) // { - // LOGGER.warning("Skill Id " + _magicId + " not found in player: " + player); + // PacketLogger.warning("Skill Id " + _magicId + " not found in player: " + player); // } return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 5fbcac0eca..9149ce1284 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListDelete; @@ -71,7 +72,7 @@ public class RequestOustPledgeMember implements IClientIncomingPacket final ClanMember member = clan.getClanMember(_target); if (member == null) { - LOGGER.warning("Target (" + _target + ") is not member of the clan"); + PacketLogger.warning("Target (" + _target + ") is not member of the clan"); return; } if (member.isOnline() && member.getPlayer().isInCombat()) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java index 9702554c3b..209835b319 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) S @@ -37,6 +38,6 @@ public class RequestPCCafeCouponUse implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestPCCafeCouponUse: S: " + _str); + PacketLogger.info("C5: RequestPCCafeCouponUse: S: " + _str); } } 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 7da966ce9f..2cd9c6a8d1 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 @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -120,7 +121,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item item = player.checkItemManipulation(i.getId(), i.getCount(), "freight"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); warehouse.deleteMe(); return; } @@ -169,7 +170,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); warehouse.deleteMe(); return; } @@ -177,7 +178,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem("Trade", i.getId(), i.getCount(), warehouse, player, null); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 2c715b4efb..0d858fb452 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -137,7 +138,7 @@ public class RequestPetUseItem implements IClientIncomingPacket else { player.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM); - LOGGER.warning("No item handler registered for itemId: " + item.getId()); + PacketLogger.warning("No item handler registered for itemId: " + item.getId()); } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index 8ece2b3ec7..fec0dc36a0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -25,6 +25,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Plim @@ -74,7 +75,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket } catch (SQLException e) { - LOGGER.severe("Error while saving petition feedback"); + PacketLogger.warning("Error while saving petition feedback."); } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java index d212481717..3459b04c80 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java @@ -44,8 +44,8 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket @Override public void run(GameClient client) { - // LOGGER.info("C5: RequestPledgeMemberInfo d:"+_unk1); - // LOGGER.info("C5: RequestPledgeMemberInfo S:"+_player); + // PacketLogger.info("C5: RequestPledgeMemberInfo d:"+_unk1); + // PacketLogger.info("C5: RequestPledgeMemberInfo S:"+_player); final Player player = client.getPlayer(); if (player == null) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index e56c105cf4..44bbd9d34c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.HashMap; import java.util.Map; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -38,6 +37,7 @@ import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; @@ -74,7 +74,7 @@ public class RequestPreviewItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } @@ -152,7 +152,7 @@ public class RequestPreviewItem implements IClientIncomingPacket final Merchant merchant = (target instanceof Merchant) ? (Merchant) target : null; if (merchant == null) { - LOGGER.warning("Null merchant!"); + PacketLogger.warning(getClass().getSimpleName() + ": Null merchant!"); 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 251757c0ba..94958bc4fe 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.util.Util; @@ -145,7 +146,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if (result > 1) { - LOGGER.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); } return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java index 9998465898..8ab3d4962f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; public class RequestPrivateStoreSell implements IClientIncomingPacket @@ -134,7 +135,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket if (!storeList.privateStoreSell(player, _items)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index a4010ca2cb..1632df189f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -193,7 +194,7 @@ public class RequestRefundItem implements IClientIncomingPacket final Item item = player.getRefund().transferItem("Refund", objectIds[i], Long.MAX_VALUE, player.getInventory(), player, player.getLastFolkNPC()); if (item == null) { - LOGGER.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index ee78579ea4..8a2f42272a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket { @@ -54,7 +55,7 @@ public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket } else { - LOGGER.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); + PacketLogger.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); } player.onTransactionRequest(requestor); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index afc4e65df4..08ad2c7763 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @version $Revision: 1.7.2.3.2.6 $ $Date: 2005/03/27 15:29:30 $ @@ -139,7 +140,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if ((player.getClan() == null) || (player.getClan().getHideoutId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.CLANHALL); @@ -167,7 +168,7 @@ public class RequestRestartPoint implements IClientIncomingPacket } else { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); return; } } @@ -199,7 +200,7 @@ public class RequestRestartPoint implements IClientIncomingPacket final Clan clan = player.getClan(); if ((clan == null) || (clan.getFortId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.FORTRESS); @@ -231,7 +232,7 @@ public class RequestRestartPoint implements IClientIncomingPacket if (((siegeClan == null) || siegeClan.getFlag().isEmpty())) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.SIEGEFLAG); @@ -241,7 +242,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if (!player.isGM() && !player.getInventory().haveItemForSelfResurrection()) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); return; } if (player.isGM() || player.destroyItemByItemId("Feather", 10649, 1, player, false) || player.destroyItemByItemId("Feather", 13300, 1, player, false) || player.destroyItemByItemId("Feather", 13128, 1, player, false)) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index ecb0ab9738..9f217064bb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExNoticePostSent; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -316,14 +317,14 @@ public class RequestSendPost implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getObjectId(), i.getCount(), "attach"); if ((oldItem == null) || !oldItem.isTradeable() || oldItem.isEquipped()) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); return false; } final Item newItem = player.getInventory().transferItem("SendMail", i.getObjectId(), i.getCount(), attachments, player, msg.getReceiverName() + "[" + msg.getReceiverId() + "]"); if (newItem == null) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java index 2a33016c9a..b5d130046c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -54,16 +55,16 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket final Castle castle = CastleManager.getInstance().getCastleById(_castleId); if ((player == null) || (castle == null)) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); return; } if ((castle.getOwnerId() > 0) && (castle.getOwnerId() != player.getClanId())) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); } else if (!player.isClanLeader()) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); } else if (!castle.isTimeRegistrationOver()) { @@ -79,12 +80,12 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); } } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); } } 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 6d1eea218a..c600906d81 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 @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; @@ -108,7 +109,7 @@ public class Say2 implements IClientIncomingPacket ChatType chatType = ChatType.findByClientId(_type); if (chatType == null) { - LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); + PacketLogger.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -116,7 +117,7 @@ public class Say2 implements IClientIncomingPacket if (_text.isEmpty()) { - LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); + PacketLogger.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -210,7 +211,7 @@ public class Say2 implements IClientIncomingPacket } else { - LOGGER.info("No handler registered for ChatType: " + _type + " Player: " + client); + PacketLogger.info("No handler registered for ChatType: " + _type + " Player: " + client); } } @@ -256,7 +257,7 @@ public class Say2 implements IClientIncomingPacket final Item item = owner.getInventory().getItemByObjectId(id); if (item == null) { - LOGGER.info(client + " trying publish item which doesnt own! ID:" + id); + PacketLogger.info(client + " trying publish item which doesnt own! ID:" + id); return false; } item.publish(); @@ -264,7 +265,7 @@ public class Say2 implements IClientIncomingPacket pos1 = _text.indexOf(8, pos) + 1; if (pos1 == 0) // missing ending tag { - LOGGER.info(client + " sent invalid publish item msg! ID:" + id); + PacketLogger.info(client + " sent invalid publish item msg! ID:" + id); return false; } } 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 f89be1cfcb..84b879e0f7 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 @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -127,7 +128,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item item = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); return; } @@ -174,7 +175,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } @@ -186,7 +187,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem(warehouse.getName(), itemHolder.getId(), itemHolder.getCount(), warehouse, player, manager); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 1840fcded7..647761584a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; @@ -163,13 +164,13 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket final Item oldItem = warehouse.getItemByObjectId(i.getId()); if ((oldItem == null) || (oldItem.getCount() < i.getCount())) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } final Item newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, manager); if (newItem == null) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); return; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 1e392c2ff7..55bf4c7f64 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -43,6 +43,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUseSharedGroupItem; @@ -280,7 +281,7 @@ public class UseItem implements IClientIncomingPacket { if ((etcItem != null) && (etcItem.getHandlerName() != null)) { - LOGGER.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); + PacketLogger.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); } } else if (handler.useItem(player, item, _ctrlPressed)) 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 20d84a2bd6..6b2f96e87d 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; @@ -60,37 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - LOGGER.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 30% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 100% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - LOGGER.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - - LOGGER.warning("Player " + player + ": Auction House (15-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); return; - } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - LOGGER.warning("Player " + player + ": Auction House (30-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + 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/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index b4b5bd9011..e4e46a5271 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -94,7 +95,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning(player + ": tried to crystallize " + item.getItem()); + PacketLogger.warning(player + ": tried to crystallize " + item.getItem()); return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index 999f5b7619..d8a8f85043 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward; @@ -62,7 +63,7 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { - LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); + PacketLogger.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java index b12c280c6d..635799d26b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java @@ -18,12 +18,12 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -102,7 +102,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e); + PacketLogger.warning("Could not add friend objectid: " + e.getMessage()); } } else diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java index 2dad174d89..73cd9a6a4b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -26,6 +25,7 @@ import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -99,7 +99,7 @@ public class RequestFriendDel implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not del friend objectid: ", e); + PacketLogger.warning("Could not del friend objectid: " + e.getMessage()); } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index 8a327f1f9c..ff61b200fb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.mentoring; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMenteeAdd; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -93,7 +93,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, e.getMessage(), e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java index 18445bd1c5..679dd76226 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.model.clan.ClanRewardBonus; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -77,7 +78,7 @@ public class RequestPledgeBonusReward implements IClientIncomingPacket } else { - LOGGER.warning(player + " Attempting to claim reward but clan(" + clan + ") doesn't have such!"); + PacketLogger.warning(player + " Attempting to claim reward but clan(" + clan + ") doesn't have such!"); } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java index ee8910d06e..a53878b794 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductList; @@ -60,7 +61,7 @@ public class RequestBRProductList implements IClientIncomingPacket } default: { - LOGGER.warning(player + " send unhandled product list type: " + _type); + PacketLogger.warning(player + " send unhandled product list type: " + _type); break; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java index e1eb0d88df..00a18163da 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.SayuneRequest; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.type.SayuneZone; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; @@ -72,7 +73,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (zone.getMapId() == -1) { player.sendMessage("That zone is not supported yet!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); return; } @@ -80,7 +81,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (map == null) { player.sendMessage("This zone is not handled yet!!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java index f1ede4ef0a..41648f184f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Shuttle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -60,7 +61,7 @@ public class RequestShuttleGetOn implements IClientIncomingPacket player.getInVehiclePosition().setXYZ(_x, _y, _z); break; } - LOGGER.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); + PacketLogger.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 33eeff5060..1b8ddb2042 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -16,11 +16,10 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Level; - import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.util.Util; /** @@ -75,7 +74,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { if (html.length() > 17200) { - LOGGER.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable()); + PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } @@ -94,7 +93,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket if (content == null) { setHtml("My Text is missing:
" + path + ""); - LOGGER.warning("missing html page " + path); + PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index e6b4b8b604..57ed88ac29 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; /** @@ -46,7 +47,7 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index d94dbf4403..75f6596194 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Migi, DS @@ -44,7 +45,7 @@ public class ExReplySentPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index b0f3738683..15d011befc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author KenM @@ -54,7 +55,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); + PacketLogger.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); packet.writeS(""); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index d588f1c7cf..b5c8628b50 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IOutgoingPacket; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; @@ -28,8 +26,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; */ public interface IClientOutgoingPacket extends IOutgoingPacket { - Logger LOGGER = Logger.getLogger(IClientOutgoingPacket.class.getName()); - int[] PAPERDOLL_ORDER = new int[] { Inventory.PAPERDOLL_UNDER, diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 058e1d34b0..818c38a076 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan.SubPledge; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author -Wooden- @@ -56,7 +57,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket } else if (_clan.getClanMember(LeaderId) == null) { - LOGGER.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); + PacketLogger.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); return ""; } else diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index 2d436d0a58..59ec218c84 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.RecipeData; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class RecipeItemMakeInfo implements IClientOutgoingPacket { @@ -58,7 +59,8 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeQ(0x00); return true; } - LOGGER.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); + + PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 432ff8ad7f..0a3fe46cb7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Shows the Siege Info
@@ -78,7 +79,7 @@ public class SiegeInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Null owner for castle: " + _castle.getName()); + PacketLogger.warning("Null owner for castle: " + _castle.getName()); } } else diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 4ed2ccc9b6..55902e07e1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; @@ -158,7 +159,7 @@ public class SystemMessage implements IClientOutgoingPacket // Mobius: With additional on-screen damage param (popup), length is increased. if (param.getType() != TYPE_POPUP_ID) { - LOGGER.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); + PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } @@ -421,7 +422,7 @@ public class SystemMessage implements IClientOutgoingPacket { if (param == null) { - LOGGER.warning("Found null parameter for SystemMessageId " + _smId); + PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 37150ec357..7af1cd273c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -24,6 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class WareHouseWithdrawalList extends AbstractItemPacket { @@ -56,7 +57,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket _invSize = player.getInventory().getSize(); if (_player.getActiveWarehouse() == null) { - LOGGER.warning("error while sending withdraw request to: " + _player.getName()); + PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/PacketLogger.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/PacketLogger.java new file mode 100644 index 0000000000..5b5a083a99 --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/PacketLogger.java @@ -0,0 +1,42 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.network; + +import java.util.logging.Logger; + +/** + * @author Mobius + */ +public class PacketLogger +{ + private static final Logger LOGGER = Logger.getLogger(PacketLogger.class.getName()); + + public static synchronized void warning(String message) + { + LOGGER.warning(message); + } + + public static synchronized void info(String message) + { + LOGGER.info(message); + } + + public static synchronized void finer(String message) + { + LOGGER.finer(message); + } +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 7c343f78be..ef3f4acc18 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -161,7 +162,7 @@ public class Action implements IClientIncomingPacket default: { // Invalid action detected (probably client cheating), log this - LOGGER.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); + PacketLogger.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); client.sendPacket(ActionFailed.STATIC_PACKET); break; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index 31d29ef3dd..8e8ae2c190 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; import org.l2jmobius.gameserver.network.serverpackets.TradeOwnAdd; @@ -58,7 +59,7 @@ public class AddTradeItem implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - LOGGER.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); + PacketLogger.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); return; } @@ -68,7 +69,7 @@ public class AddTradeItem implements IClientIncomingPacket // Trade partner not found, cancel trade if (partner != null) { - LOGGER.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); + PacketLogger.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); } player.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE); player.cancelActiveTrade(); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 20134dd2bb..a3236b0d83 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -62,7 +62,7 @@ public class CannotMoveAnymore implements IClientIncomingPacket // player.stopMove(); // // if (Config.DEBUG) - // LOGGER.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ + // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); // StopMove smwl = new StopMove(player); // client.getPlayer().sendPacket(smwl); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index e25524223a..0b6571d963 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -43,6 +43,7 @@ import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; import org.l2jmobius.gameserver.network.serverpackets.CharCreateOk; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -124,21 +125,21 @@ public class CharacterCreate implements IClientIncomingPacket if ((_face > 2) || (_face < 0)) { - LOGGER.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairStyle < 0) || ((_sex == 0) && (_hairStyle > 4)) || ((_sex != 0) && (_hairStyle > 6))) { - LOGGER.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairColor > 3) || (_hairColor < 0)) { - LOGGER.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } @@ -303,7 +304,7 @@ public class CharacterCreate implements IClientIncomingPacket final Item item = newChar.getInventory().addItem("Init", ie.getId(), ie.getCount(), newChar, null); if (item == null) { - LOGGER.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); + PacketLogger.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); continue; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java index 86c425fa45..63c3261946 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Level; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.CharacterDeleteFailType; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -25,6 +23,7 @@ import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDelete; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteFail; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteSuccess; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -74,7 +73,7 @@ public class CharacterDelete implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Error:", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1, 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java index 5f74c38273..cfe9b20f3d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java @@ -47,7 +47,7 @@ public class EndScenePlayer implements IClientIncomingPacket final MovieHolder holder = player.getMovieHolder(); if ((holder == null) || (holder.getMovie().getClientId() != _movieId)) { - // LOGGER.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); + // PacketLogger.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index f03c9a44e2..c884e1df3c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -68,6 +68,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.Die; @@ -153,7 +154,7 @@ public class EnterWorld implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.warning("EnterWorld failed! player returned 'null'."); + PacketLogger.warning("EnterWorld failed! player returned 'null'."); Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java index 8bde20da0a..14e8153478 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java @@ -25,9 +25,13 @@ import org.l2jmobius.gameserver.network.GameClient; */ public class ExGetOnAirShip implements IClientIncomingPacket { + @SuppressWarnings("unused") private int _x; + @SuppressWarnings("unused") private int _y; + @SuppressWarnings("unused") private int _z; + @SuppressWarnings("unused") private int _shipId; @Override @@ -43,9 +47,9 @@ public class ExGetOnAirShip implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("[T1:ExGetOnAirShip] x: " + _x); - LOGGER.info("[T1:ExGetOnAirShip] y: " + _y); - LOGGER.info("[T1:ExGetOnAirShip] z: " + _z); - LOGGER.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); + // PacketLogger.info("[T1:ExGetOnAirShip] x: " + _x); + // PacketLogger.info("[T1:ExGetOnAirShip] y: " + _y); + // PacketLogger.info("[T1:ExGetOnAirShip] z: " + _z); + // PacketLogger.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/ExOpenHtml.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/ExOpenHtml.java index 3f87ca81c1..b1e46456e9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/ExOpenHtml.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/ExOpenHtml.java @@ -21,6 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; /** @@ -70,7 +71,7 @@ public class ExOpenHtml implements IClientIncomingPacket } default: { - LOGGER.warning("Unknown ExOpenHtml type (" + _type + ")"); + PacketLogger.warning("Unknown ExOpenHtml type (" + _type + ")"); break; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/ExRequestTeleport.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/ExRequestTeleport.java index c7114f8d0e..ba6336154f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/ExRequestTeleport.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/ExRequestTeleport.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.holders.TeleportListHolder; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; /** @@ -54,7 +55,7 @@ public class ExRequestTeleport implements IClientIncomingPacket final TeleportListHolder teleport = TeleportListData.getInstance().getTeleport(_teleportId); if (teleport == null) { - LOGGER.warning("No registered teleport location for id: " + _teleportId); + PacketLogger.warning("No registered teleport location for id: " + _teleportId); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java index fcdd8335f4..4e91188f5c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java @@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Arrays; -import java.util.logging.Level; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: c dddd @@ -79,7 +79,7 @@ public class GameGuardReply implements IClientIncomingPacket } catch (NoSuchAlgorithmException e) { - LOGGER.log(Level.WARNING, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java index eddff9f891..62e69acd86 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.gameserver.network.GameClient; @@ -27,5 +25,4 @@ import org.l2jmobius.gameserver.network.GameClient; */ public interface IClientIncomingPacket extends IIncomingPacket { - Logger LOGGER = Logger.getLogger(IClientIncomingPacket.class.getName()); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index ea86074f0e..91a2b46047 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -153,7 +154,7 @@ public class MultiSellChoose implements IClientIncomingPacket if (((_soulCrystalOptions != null) && CommonUtil.contains(_soulCrystalOptions, null)) || ((_soulCrystalSpecialOptions != null) && CommonUtil.contains(_soulCrystalSpecialOptions, null))) { - LOGGER.severe("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -161,14 +162,14 @@ public class MultiSellChoose implements IClientIncomingPacket final MultisellEntryHolder entry = list.getEntries().get(_entryId - 1); // Entry Id begins from 1. We currently use entry IDs as index pointer. if (entry == null) { - LOGGER.severe("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } if (!entry.isStackable() && (_amount > 1)) { - LOGGER.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -196,7 +197,7 @@ public class MultiSellChoose implements IClientIncomingPacket )) //@formatter:on { - LOGGER.severe("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -368,7 +369,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); return; } } @@ -478,7 +479,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); return; } } @@ -673,7 +674,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); + PacketLogger.warning("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); return false; } } 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 f2fe1a9c18..411c71344c 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 @@ -43,6 +43,7 @@ import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillDone; import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; @@ -96,7 +97,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if ((_level < 1) || (_level > 1000) || (_id < 1) || (_id > 64000)) { Util.handleIllegalPlayerAction(player, "Wrong Packet Data in Aquired Skill", Config.DEFAULT_PUNISH); - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); return; } @@ -110,7 +111,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - LOGGER.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -417,7 +418,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket } default: { - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); break; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 52ec7e5132..550735eb12 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillInfo; import org.l2jmobius.gameserver.network.serverpackets.ExAcquireSkillInfo; @@ -54,7 +55,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket { if ((_id <= 0) || (_level <= 0)) { - LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); return; } @@ -73,7 +74,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level); if (skill == null) { - LOGGER.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); + PacketLogger.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); return; } 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 5e0a2af0c9..8078d0c10e 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.Arrays; -import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.ActionData; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; @@ -41,8 +41,6 @@ import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList; */ public class RequestActionUse implements IClientIncomingPacket { - private static final Logger LOGGER = Logger.getLogger(RequestActionUse.class.getName()); - private int _actionId; private boolean _ctrlPressed; private boolean _shiftPressed; @@ -93,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } @@ -107,7 +105,7 @@ public class RequestActionUse implements IClientIncomingPacket actionHandler.useAction(player, actionHolder, _ctrlPressed, _shiftPressed); return; } - LOGGER.warning("Couldnt find handler with name: " + actionHolder.getHandler()); + PacketLogger.warning("Couldn't find handler with name: " + actionHolder.getHandler()); return; } @@ -143,7 +141,7 @@ public class RequestActionUse implements IClientIncomingPacket } default: { - LOGGER.warning(player.getName() + ": unhandled action type " + _actionId); + PacketLogger.warning(player.getName() + ": unhandled action type " + _actionId); break; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java index 1fa1214bea..76649875f1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.data.xml.FakePlayerData; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -130,7 +131,7 @@ public class RequestBlock implements IClientIncomingPacket } default: { - LOGGER.info("Unknown 0xA9 block type: " + _type); + PacketLogger.info("Unknown 0xA9 block type: " + _type); } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index eb7e62ebf2..ce3d851f06 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -161,7 +162,7 @@ public class RequestBuyItem implements IClientIncomingPacket long price = product.getPrice(); if (price < 0) { - LOGGER.warning("ERROR, no price found .. wrong buylist ??"); + PacketLogger.warning("ERROR, no price found .. wrong buylist ??"); client.sendPacket(ActionFailed.STATIC_PACKET); 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 a7e3f28ed6..dd5c90fce2 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.StringTokenizer; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -41,6 +40,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -88,7 +88,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -192,7 +192,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (NumberFormatException nfe) { - LOGGER.log(Level.WARNING, "NFE for command [" + _command + "]", nfe); + PacketLogger.warning("NFE for command [" + _command + "] " + nfe.getMessage()); } } else if (_command.startsWith("_match")) @@ -284,13 +284,13 @@ public class RequestBypassToServer implements IClientIncomingPacket } else { - LOGGER.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); + PacketLogger.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); } } } catch (Exception e) { - LOGGER.log(Level.WARNING, "Exception processing bypass from player " + player.getName() + ": " + _command, e); + PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _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/RequestCrystallizeItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index f3d775a15b..be08d7f35d 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -59,7 +60,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.finer("RequestCrystalizeItem: activeChar was null"); + // PacketLogger.finer("RequestCrystalizeItem: activeChar was null."); return; } @@ -87,7 +88,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - LOGGER.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 4f351a636b..cb90d581c8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; @@ -33,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -169,7 +169,7 @@ public class RequestDestroyItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not delete pet objectid: ", e); + PacketLogger.warning("Could not delete pet objectid: " + e.getMessage()); } } if (itemToRemove.isTimeLimitedItem()) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 0e4b623bb3..b7d4ac63a9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.GMAudit; import org.l2jmobius.gameserver.util.Util; @@ -210,7 +211,7 @@ public class RequestDropItem implements IClientIncomingPacket if ((dropedItem != null) && (dropedItem.getId() == Inventory.ADENA_ID) && (dropedItem.getCount() >= 1000000)) { final String msg = "Character (" + player.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")"; - LOGGER.warning(msg); + PacketLogger.warning(msg); AdminData.getInstance().broadcastMessageToGMs(msg); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java index e3ab837779..e8bfc249c9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ExNeedToChangeName; /** @@ -42,6 +43,6 @@ public class RequestExChangeName implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); + PacketLogger.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java index 6e4861568e..c2f02f89ad 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chdd d: Arena d: Team @@ -74,7 +75,7 @@ public class RequestExCubeGameChangeTeam implements IClientIncomingPacket } default: { - LOGGER.warning("Wrong Cube Game Team ID: " + _team); + PacketLogger.warning("Wrong Cube Game Team ID: " + _team); break; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java index 009b836b6d..d72fdfc413 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chddd d: Arena d: Answer @@ -64,7 +65,7 @@ public class RequestExCubeGameReadyAnswer implements IClientIncomingPacket } default: { - LOGGER.warning("Unknown Cube Game Answer ID: " + _answer); + PacketLogger.warning("Unknown Cube Game Answer ID: " + _answer); break; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java index ff12adb20d..3347f01941 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) just a trigger @@ -34,6 +35,6 @@ public class RequestExFishRanking implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestExFishRanking"); + PacketLogger.info("C5: RequestExFishRanking"); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 57e8e7d2e5..8851aef463 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; import org.l2jmobius.gameserver.util.Broadcast; @@ -86,7 +87,7 @@ public class RequestExMagicSkillUseGround implements IClientIncomingPacket else { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("No skill found with id " + _skillId + " and level " + level + " !!"); + PacketLogger.warning("No skill found with id " + _skillId + " and level " + level + " !!"); } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 77093c5f2d..2d9f0456f4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; @@ -73,7 +74,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket client.sendPacket(new ExPutEnchantTargetItemResult(0)); if (scrollTemplate == null) { - LOGGER.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); + PacketLogger.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); } return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java index 05e09e6dfc..0a4522bf64 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressMapInfo; @@ -43,7 +44,7 @@ public class RequestFortressMapInfo implements IClientIncomingPacket final Fort fort = FortManager.getInstance().getFortById(_fortressId); if (fort == null) { - LOGGER.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); + PacketLogger.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); if (client.getPlayer() == null) { 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 f65a63d325..dc903790d0 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 @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) d @@ -44,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - LOGGER.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning("Player " + 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/RequestGetItemFromPet.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index a9fd8d923a..48e75fc61b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.util.Util; @@ -84,7 +85,7 @@ public class RequestGetItemFromPet implements IClientIncomingPacket } else { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 79e1193ac0..22f2f24422 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.util.Util; @@ -124,7 +125,7 @@ public class RequestGiveItemToPet implements IClientIncomingPacket } else { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } 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 d0add3fa49..04abcbce46 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 @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaEquipList; @@ -67,7 +68,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.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 fa21b68043..a7c019d65d 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; @@ -52,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - LOGGER.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); } client.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 b943775334..ff96a400c9 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; @@ -50,10 +51,11 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.sendPacket(ActionFailed.STATIC_PACKET); return; } + player.sendPacket(new HennaItemRemoveInfo(henna, player)); } } 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 ab9f0c33f7..89e11ba6a9 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -75,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); client.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 53f04488a6..ada67e190c 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -49,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - LOGGER.warning("Player " + actor.getName() + " sent empty html link!"); + PacketLogger.warning("Player " + actor.getName() + " sent empty html link!"); return; } if (_link.contains("..")) { - LOGGER.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); return; } final int htmlObjectId = actor.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - LOGGER.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java index 89adeae67b..2e1c1c83f6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author UnAfraid @@ -51,7 +52,7 @@ public class RequestMagicSkillList implements IClientIncomingPacket if (player.getObjectId() != _objectId) { - LOGGER.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); + PacketLogger.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 9432941937..a228079092 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -64,7 +64,7 @@ public class RequestMagicSkillUse implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); // if (_magicId > 0) // { - // LOGGER.warning("Skill Id " + _magicId + " not found in player: " + player); + // PacketLogger.warning("Skill Id " + _magicId + " not found in player: " + player); // } return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 5fbcac0eca..9149ce1284 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListDelete; @@ -71,7 +72,7 @@ public class RequestOustPledgeMember implements IClientIncomingPacket final ClanMember member = clan.getClanMember(_target); if (member == null) { - LOGGER.warning("Target (" + _target + ") is not member of the clan"); + PacketLogger.warning("Target (" + _target + ") is not member of the clan"); return; } if (member.isOnline() && member.getPlayer().isInCombat()) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java index 9702554c3b..209835b319 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) S @@ -37,6 +38,6 @@ public class RequestPCCafeCouponUse implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestPCCafeCouponUse: S: " + _str); + PacketLogger.info("C5: RequestPCCafeCouponUse: S: " + _str); } } 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 7da966ce9f..2cd9c6a8d1 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 @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -120,7 +121,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item item = player.checkItemManipulation(i.getId(), i.getCount(), "freight"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); warehouse.deleteMe(); return; } @@ -169,7 +170,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); warehouse.deleteMe(); return; } @@ -177,7 +178,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem("Trade", i.getId(), i.getCount(), warehouse, player, null); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 2c715b4efb..0d858fb452 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -137,7 +138,7 @@ public class RequestPetUseItem implements IClientIncomingPacket else { player.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM); - LOGGER.warning("No item handler registered for itemId: " + item.getId()); + PacketLogger.warning("No item handler registered for itemId: " + item.getId()); } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index 8ece2b3ec7..fec0dc36a0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -25,6 +25,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Plim @@ -74,7 +75,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket } catch (SQLException e) { - LOGGER.severe("Error while saving petition feedback"); + PacketLogger.warning("Error while saving petition feedback."); } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java index d212481717..3459b04c80 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java @@ -44,8 +44,8 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket @Override public void run(GameClient client) { - // LOGGER.info("C5: RequestPledgeMemberInfo d:"+_unk1); - // LOGGER.info("C5: RequestPledgeMemberInfo S:"+_player); + // PacketLogger.info("C5: RequestPledgeMemberInfo d:"+_unk1); + // PacketLogger.info("C5: RequestPledgeMemberInfo S:"+_player); final Player player = client.getPlayer(); if (player == null) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index e56c105cf4..44bbd9d34c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.HashMap; import java.util.Map; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -38,6 +37,7 @@ import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; @@ -74,7 +74,7 @@ public class RequestPreviewItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } @@ -152,7 +152,7 @@ public class RequestPreviewItem implements IClientIncomingPacket final Merchant merchant = (target instanceof Merchant) ? (Merchant) target : null; if (merchant == null) { - LOGGER.warning("Null merchant!"); + PacketLogger.warning(getClass().getSimpleName() + ": Null merchant!"); 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 251757c0ba..94958bc4fe 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.util.Util; @@ -145,7 +146,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if (result > 1) { - LOGGER.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); } return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java index 9998465898..8ab3d4962f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; public class RequestPrivateStoreSell implements IClientIncomingPacket @@ -134,7 +135,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket if (!storeList.privateStoreSell(player, _items)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index a4010ca2cb..1632df189f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -193,7 +194,7 @@ public class RequestRefundItem implements IClientIncomingPacket final Item item = player.getRefund().transferItem("Refund", objectIds[i], Long.MAX_VALUE, player.getInventory(), player, player.getLastFolkNPC()); if (item == null) { - LOGGER.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index ee78579ea4..8a2f42272a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket { @@ -54,7 +55,7 @@ public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket } else { - LOGGER.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); + PacketLogger.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); } player.onTransactionRequest(requestor); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index afc4e65df4..08ad2c7763 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @version $Revision: 1.7.2.3.2.6 $ $Date: 2005/03/27 15:29:30 $ @@ -139,7 +140,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if ((player.getClan() == null) || (player.getClan().getHideoutId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.CLANHALL); @@ -167,7 +168,7 @@ public class RequestRestartPoint implements IClientIncomingPacket } else { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); return; } } @@ -199,7 +200,7 @@ public class RequestRestartPoint implements IClientIncomingPacket final Clan clan = player.getClan(); if ((clan == null) || (clan.getFortId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.FORTRESS); @@ -231,7 +232,7 @@ public class RequestRestartPoint implements IClientIncomingPacket if (((siegeClan == null) || siegeClan.getFlag().isEmpty())) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.SIEGEFLAG); @@ -241,7 +242,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if (!player.isGM() && !player.getInventory().haveItemForSelfResurrection()) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); return; } if (player.isGM() || player.destroyItemByItemId("Feather", 10649, 1, player, false) || player.destroyItemByItemId("Feather", 13300, 1, player, false) || player.destroyItemByItemId("Feather", 13128, 1, player, false)) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index ecb0ab9738..9f217064bb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExNoticePostSent; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -316,14 +317,14 @@ public class RequestSendPost implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getObjectId(), i.getCount(), "attach"); if ((oldItem == null) || !oldItem.isTradeable() || oldItem.isEquipped()) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); return false; } final Item newItem = player.getInventory().transferItem("SendMail", i.getObjectId(), i.getCount(), attachments, player, msg.getReceiverName() + "[" + msg.getReceiverId() + "]"); if (newItem == null) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java index 2a33016c9a..b5d130046c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -54,16 +55,16 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket final Castle castle = CastleManager.getInstance().getCastleById(_castleId); if ((player == null) || (castle == null)) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); return; } if ((castle.getOwnerId() > 0) && (castle.getOwnerId() != player.getClanId())) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); } else if (!player.isClanLeader()) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); } else if (!castle.isTimeRegistrationOver()) { @@ -79,12 +80,12 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); } } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); } } 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 6d1eea218a..c600906d81 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 @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; @@ -108,7 +109,7 @@ public class Say2 implements IClientIncomingPacket ChatType chatType = ChatType.findByClientId(_type); if (chatType == null) { - LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); + PacketLogger.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -116,7 +117,7 @@ public class Say2 implements IClientIncomingPacket if (_text.isEmpty()) { - LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); + PacketLogger.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -210,7 +211,7 @@ public class Say2 implements IClientIncomingPacket } else { - LOGGER.info("No handler registered for ChatType: " + _type + " Player: " + client); + PacketLogger.info("No handler registered for ChatType: " + _type + " Player: " + client); } } @@ -256,7 +257,7 @@ public class Say2 implements IClientIncomingPacket final Item item = owner.getInventory().getItemByObjectId(id); if (item == null) { - LOGGER.info(client + " trying publish item which doesnt own! ID:" + id); + PacketLogger.info(client + " trying publish item which doesnt own! ID:" + id); return false; } item.publish(); @@ -264,7 +265,7 @@ public class Say2 implements IClientIncomingPacket pos1 = _text.indexOf(8, pos) + 1; if (pos1 == 0) // missing ending tag { - LOGGER.info(client + " sent invalid publish item msg! ID:" + id); + PacketLogger.info(client + " sent invalid publish item msg! ID:" + id); return false; } } 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 f89be1cfcb..84b879e0f7 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 @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -127,7 +128,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item item = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); return; } @@ -174,7 +175,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } @@ -186,7 +187,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem(warehouse.getName(), itemHolder.getId(), itemHolder.getCount(), warehouse, player, manager); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 1840fcded7..647761584a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; @@ -163,13 +164,13 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket final Item oldItem = warehouse.getItemByObjectId(i.getId()); if ((oldItem == null) || (oldItem.getCount() < i.getCount())) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } final Item newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, manager); if (newItem == null) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); return; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 1e392c2ff7..55bf4c7f64 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -43,6 +43,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUseSharedGroupItem; @@ -280,7 +281,7 @@ public class UseItem implements IClientIncomingPacket { if ((etcItem != null) && (etcItem.getHandlerName() != null)) { - LOGGER.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); + PacketLogger.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); } } else if (handler.useItem(player, item, _ctrlPressed)) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java index abdde51526..2cc8f78c60 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.model.ElementalSpirit; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.PlaySound; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; @@ -66,7 +67,7 @@ public class ExRequestClassChange implements IClientIncomingPacket } if (!canChange) { - LOGGER.warning(player + " tried to change class from " + player.getClassId() + " to " + ClassId.getClassId(_classId) + "!"); + PacketLogger.warning(player + " tried to change class from " + player.getClassId() + " to " + ClassId.getClassId(_classId) + "!"); 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 20d84a2bd6..6b2f96e87d 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; @@ -60,37 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - LOGGER.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 30% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 100% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - LOGGER.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - - LOGGER.warning("Player " + player + ": Auction House (15-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); return; - } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - LOGGER.warning("Player " + player + ": Auction House (30-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + 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/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index b4b5bd9011..e4e46a5271 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -94,7 +95,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning(player + ": tried to crystallize " + item.getItem()); + PacketLogger.warning(player + ": tried to crystallize " + item.getItem()); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index 999f5b7619..d8a8f85043 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward; @@ -62,7 +63,7 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { - LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); + PacketLogger.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java index b12c280c6d..635799d26b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java @@ -18,12 +18,12 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -102,7 +102,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e); + PacketLogger.warning("Could not add friend objectid: " + e.getMessage()); } } else diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java index 2dad174d89..73cd9a6a4b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -26,6 +25,7 @@ import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -99,7 +99,7 @@ public class RequestFriendDel implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not del friend objectid: ", e); + PacketLogger.warning("Could not del friend objectid: " + e.getMessage()); } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index ff8eb57629..e4ad042344 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.mentoring; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -28,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMenteeAdd; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -91,7 +91,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, e.getMessage(), e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java index 18445bd1c5..679dd76226 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.model.clan.ClanRewardBonus; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -77,7 +78,7 @@ public class RequestPledgeBonusReward implements IClientIncomingPacket } else { - LOGGER.warning(player + " Attempting to claim reward but clan(" + clan + ") doesn't have such!"); + PacketLogger.warning(player + " Attempting to claim reward but clan(" + clan + ") doesn't have such!"); } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java index ee8910d06e..a53878b794 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductList; @@ -60,7 +61,7 @@ public class RequestBRProductList implements IClientIncomingPacket } default: { - LOGGER.warning(player + " send unhandled product list type: " + _type); + PacketLogger.warning(player + " send unhandled product list type: " + _type); break; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java index 1c6488efd4..21aa8f4169 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.request.SayuneRequest; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.type.SayuneZone; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; @@ -71,7 +72,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (zone.getMapId() == -1) { player.sendMessage("That zone is not supported yet!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); return; } @@ -79,7 +80,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (map == null) { player.sendMessage("This zone is not handled yet!!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java index f1ede4ef0a..41648f184f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Shuttle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -60,7 +61,7 @@ public class RequestShuttleGetOn implements IClientIncomingPacket player.getInVehiclePosition().setXYZ(_x, _y, _z); break; } - LOGGER.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); + PacketLogger.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 33eeff5060..1b8ddb2042 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -16,11 +16,10 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Level; - import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.util.Util; /** @@ -75,7 +74,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { if (html.length() > 17200) { - LOGGER.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable()); + PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } @@ -94,7 +93,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket if (content == null) { setHtml("My Text is missing:
" + path + ""); - LOGGER.warning("missing html page " + path); + PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index e6b4b8b604..57ed88ac29 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; /** @@ -46,7 +47,7 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index d94dbf4403..75f6596194 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Migi, DS @@ -44,7 +45,7 @@ public class ExReplySentPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index b0f3738683..15d011befc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author KenM @@ -54,7 +55,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); + PacketLogger.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); packet.writeS(""); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index d588f1c7cf..b5c8628b50 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IOutgoingPacket; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; @@ -28,8 +26,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; */ public interface IClientOutgoingPacket extends IOutgoingPacket { - Logger LOGGER = Logger.getLogger(IClientOutgoingPacket.class.getName()); - int[] PAPERDOLL_ORDER = new int[] { Inventory.PAPERDOLL_UNDER, diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 058e1d34b0..818c38a076 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan.SubPledge; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author -Wooden- @@ -56,7 +57,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket } else if (_clan.getClanMember(LeaderId) == null) { - LOGGER.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); + PacketLogger.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); return ""; } else diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index 2d436d0a58..59ec218c84 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.RecipeData; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class RecipeItemMakeInfo implements IClientOutgoingPacket { @@ -58,7 +59,8 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeQ(0x00); return true; } - LOGGER.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); + + PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 432ff8ad7f..0a3fe46cb7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Shows the Siege Info
@@ -78,7 +79,7 @@ public class SiegeInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Null owner for castle: " + _castle.getName()); + PacketLogger.warning("Null owner for castle: " + _castle.getName()); } } else diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 4ed2ccc9b6..55902e07e1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; @@ -158,7 +159,7 @@ public class SystemMessage implements IClientOutgoingPacket // Mobius: With additional on-screen damage param (popup), length is increased. if (param.getType() != TYPE_POPUP_ID) { - LOGGER.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); + PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } @@ -421,7 +422,7 @@ public class SystemMessage implements IClientOutgoingPacket { if (param == null) { - LOGGER.warning("Found null parameter for SystemMessageId " + _smId); + PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 37150ec357..7af1cd273c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -24,6 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class WareHouseWithdrawalList extends AbstractItemPacket { @@ -56,7 +57,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket _invSize = player.getInventory().getSize(); if (_player.getActiveWarehouse() == null) { - LOGGER.warning("error while sending withdraw request to: " + _player.getName()); + PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java index 2cc486dc57..64c9f64e69 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.instancemanager.RankManager; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; /** @@ -152,7 +153,7 @@ public class ExOlympiadHeroAndLegendInfo implements IClientOutgoingPacket } catch (SQLException e) { - LOGGER.warning("Hero and Legend Info: Couldnt load data: " + e.getMessage()); + PacketLogger.warning("Hero and Legend Info: Couldnt load data: " + e.getMessage()); } } return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java index 61b1665ede..1806b92dad 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; /** @@ -98,7 +99,7 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket } catch (SQLException e) { - LOGGER.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); + PacketLogger.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); } int previousPlace = 0; @@ -127,7 +128,7 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket } catch (SQLException e) { - LOGGER.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); + PacketLogger.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); } int heroCount = 0; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/PacketLogger.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/PacketLogger.java new file mode 100644 index 0000000000..5b5a083a99 --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/PacketLogger.java @@ -0,0 +1,42 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.network; + +import java.util.logging.Logger; + +/** + * @author Mobius + */ +public class PacketLogger +{ + private static final Logger LOGGER = Logger.getLogger(PacketLogger.class.getName()); + + public static synchronized void warning(String message) + { + LOGGER.warning(message); + } + + public static synchronized void info(String message) + { + LOGGER.info(message); + } + + public static synchronized void finer(String message) + { + LOGGER.finer(message); + } +} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 7c343f78be..ef3f4acc18 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -161,7 +162,7 @@ public class Action implements IClientIncomingPacket default: { // Invalid action detected (probably client cheating), log this - LOGGER.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); + PacketLogger.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); client.sendPacket(ActionFailed.STATIC_PACKET); break; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index db177c478d..922a088a0b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; import org.l2jmobius.gameserver.network.serverpackets.TradeOwnAdd; @@ -57,7 +58,7 @@ public class AddTradeItem implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - LOGGER.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); + PacketLogger.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); return; } @@ -67,7 +68,7 @@ public class AddTradeItem implements IClientIncomingPacket // Trade partner not found, cancel trade if (partner != null) { - LOGGER.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); + PacketLogger.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); } player.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE); player.cancelActiveTrade(); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 20134dd2bb..a3236b0d83 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -62,7 +62,7 @@ public class CannotMoveAnymore implements IClientIncomingPacket // player.stopMove(); // // if (Config.DEBUG) - // LOGGER.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ + // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); // StopMove smwl = new StopMove(player); // client.getPlayer().sendPacket(smwl); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index e25524223a..0b6571d963 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -43,6 +43,7 @@ import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; import org.l2jmobius.gameserver.network.serverpackets.CharCreateOk; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -124,21 +125,21 @@ public class CharacterCreate implements IClientIncomingPacket if ((_face > 2) || (_face < 0)) { - LOGGER.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairStyle < 0) || ((_sex == 0) && (_hairStyle > 4)) || ((_sex != 0) && (_hairStyle > 6))) { - LOGGER.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairColor > 3) || (_hairColor < 0)) { - LOGGER.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } @@ -303,7 +304,7 @@ public class CharacterCreate implements IClientIncomingPacket final Item item = newChar.getInventory().addItem("Init", ie.getId(), ie.getCount(), newChar, null); if (item == null) { - LOGGER.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); + PacketLogger.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); continue; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java index 86c425fa45..63c3261946 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Level; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.CharacterDeleteFailType; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -25,6 +23,7 @@ import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDelete; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteFail; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteSuccess; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -74,7 +73,7 @@ public class CharacterDelete implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Error:", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1, 0); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java index 5f74c38273..cfe9b20f3d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java @@ -47,7 +47,7 @@ public class EndScenePlayer implements IClientIncomingPacket final MovieHolder holder = player.getMovieHolder(); if ((holder == null) || (holder.getMovie().getClientId() != _movieId)) { - // LOGGER.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); + // PacketLogger.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 6c76a72c49..d17497a229 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -67,6 +67,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.Die; @@ -149,7 +150,7 @@ public class EnterWorld implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.warning("EnterWorld failed! player returned 'null'."); + PacketLogger.warning("EnterWorld failed! player returned 'null'."); Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java index 8bde20da0a..14e8153478 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java @@ -25,9 +25,13 @@ import org.l2jmobius.gameserver.network.GameClient; */ public class ExGetOnAirShip implements IClientIncomingPacket { + @SuppressWarnings("unused") private int _x; + @SuppressWarnings("unused") private int _y; + @SuppressWarnings("unused") private int _z; + @SuppressWarnings("unused") private int _shipId; @Override @@ -43,9 +47,9 @@ public class ExGetOnAirShip implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("[T1:ExGetOnAirShip] x: " + _x); - LOGGER.info("[T1:ExGetOnAirShip] y: " + _y); - LOGGER.info("[T1:ExGetOnAirShip] z: " + _z); - LOGGER.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); + // PacketLogger.info("[T1:ExGetOnAirShip] x: " + _x); + // PacketLogger.info("[T1:ExGetOnAirShip] y: " + _y); + // PacketLogger.info("[T1:ExGetOnAirShip] z: " + _z); + // PacketLogger.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java index fcdd8335f4..4e91188f5c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java @@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Arrays; -import java.util.logging.Level; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: c dddd @@ -79,7 +79,7 @@ public class GameGuardReply implements IClientIncomingPacket } catch (NoSuchAlgorithmException e) { - LOGGER.log(Level.WARNING, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java index eddff9f891..62e69acd86 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.gameserver.network.GameClient; @@ -27,5 +25,4 @@ import org.l2jmobius.gameserver.network.GameClient; */ public interface IClientIncomingPacket extends IIncomingPacket { - Logger LOGGER = Logger.getLogger(IClientIncomingPacket.class.getName()); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 677119b0b1..8e5a5e04ff 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -39,6 +39,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -130,14 +131,14 @@ public class MultiSellChoose implements IClientIncomingPacket final MultisellEntryHolder entry = list.getEntries().get(_entryId - 1); // Entry Id begins from 1. We currently use entry IDs as index pointer. if (entry == null) { - LOGGER.severe("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } if (!entry.isStackable() && (_amount > 1)) { - LOGGER.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -161,7 +162,7 @@ public class MultiSellChoose implements IClientIncomingPacket )) //@formatter:on { - LOGGER.severe("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -333,7 +334,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); return; } } @@ -443,7 +444,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); return; } } @@ -622,7 +623,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); + PacketLogger.warning("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); return false; } } 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 b7b93ee7db..45cab77cbf 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 @@ -45,6 +45,7 @@ import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillDone; import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; @@ -105,7 +106,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if ((_level < 1) || (_level > 1000) || (_id < 1) || (_id > 64000)) { Util.handleIllegalPlayerAction(player, "Wrong Packet Data in Aquired Skill", Config.DEFAULT_PUNISH); - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); return; } @@ -119,7 +120,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - LOGGER.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -498,7 +499,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket } default: { - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); break; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 0a570fd3ef..4bb789645a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillInfo; import org.l2jmobius.gameserver.network.serverpackets.ExAcquireSkillInfo; @@ -55,7 +56,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket { if ((_id <= 0) || (_level <= 0)) { - LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); return; } @@ -74,7 +75,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level); if (skill == null) { - LOGGER.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); + PacketLogger.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); return; } 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 5e0a2af0c9..8078d0c10e 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.Arrays; -import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.ActionData; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; @@ -41,8 +41,6 @@ import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList; */ public class RequestActionUse implements IClientIncomingPacket { - private static final Logger LOGGER = Logger.getLogger(RequestActionUse.class.getName()); - private int _actionId; private boolean _ctrlPressed; private boolean _shiftPressed; @@ -93,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } @@ -107,7 +105,7 @@ public class RequestActionUse implements IClientIncomingPacket actionHandler.useAction(player, actionHolder, _ctrlPressed, _shiftPressed); return; } - LOGGER.warning("Couldnt find handler with name: " + actionHolder.getHandler()); + PacketLogger.warning("Couldn't find handler with name: " + actionHolder.getHandler()); return; } @@ -143,7 +141,7 @@ public class RequestActionUse implements IClientIncomingPacket } default: { - LOGGER.warning(player.getName() + ": unhandled action type " + _actionId); + PacketLogger.warning(player.getName() + ": unhandled action type " + _actionId); break; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java index 1fa1214bea..76649875f1 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.data.xml.FakePlayerData; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -130,7 +131,7 @@ public class RequestBlock implements IClientIncomingPacket } default: { - LOGGER.info("Unknown 0xA9 block type: " + _type); + PacketLogger.info("Unknown 0xA9 block type: " + _type); } } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index eb7e62ebf2..ce3d851f06 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -161,7 +162,7 @@ public class RequestBuyItem implements IClientIncomingPacket long price = product.getPrice(); if (price < 0) { - LOGGER.warning("ERROR, no price found .. wrong buylist ??"); + PacketLogger.warning("ERROR, no price found .. wrong buylist ??"); client.sendPacket(ActionFailed.STATIC_PACKET); 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 a7e3f28ed6..dd5c90fce2 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.StringTokenizer; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -41,6 +40,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -88,7 +88,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -192,7 +192,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (NumberFormatException nfe) { - LOGGER.log(Level.WARNING, "NFE for command [" + _command + "]", nfe); + PacketLogger.warning("NFE for command [" + _command + "] " + nfe.getMessage()); } } else if (_command.startsWith("_match")) @@ -284,13 +284,13 @@ public class RequestBypassToServer implements IClientIncomingPacket } else { - LOGGER.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); + PacketLogger.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); } } } catch (Exception e) { - LOGGER.log(Level.WARNING, "Exception processing bypass from player " + player.getName() + ": " + _command, e); + PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _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/RequestCrystallizeItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index af45d9defb..03d610fe78 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -59,7 +60,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.finer("RequestCrystalizeItem: activeChar was null"); + // PacketLogger.finer("RequestCrystalizeItem: activeChar was null."); return; } @@ -87,7 +88,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - LOGGER.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index c67449efed..71bb657bf9 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; @@ -33,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -169,7 +169,7 @@ public class RequestDestroyItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not delete pet objectid: ", e); + PacketLogger.warning("Could not delete pet objectid: " + e.getMessage()); } } if (itemToRemove.isTimeLimitedItem()) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 35f1f3c33e..5b6fea109a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.GMAudit; import org.l2jmobius.gameserver.util.Util; @@ -210,7 +211,7 @@ public class RequestDropItem implements IClientIncomingPacket if ((dropedItem != null) && (dropedItem.getId() == Inventory.ADENA_ID) && (dropedItem.getCount() >= 1000000)) { final String msg = "Character (" + player.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")"; - LOGGER.warning(msg); + PacketLogger.warning(msg); AdminData.getInstance().broadcastMessageToGMs(msg); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java index e3ab837779..e8bfc249c9 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ExNeedToChangeName; /** @@ -42,6 +43,6 @@ public class RequestExChangeName implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); + PacketLogger.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java index 6e4861568e..c2f02f89ad 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chdd d: Arena d: Team @@ -74,7 +75,7 @@ public class RequestExCubeGameChangeTeam implements IClientIncomingPacket } default: { - LOGGER.warning("Wrong Cube Game Team ID: " + _team); + PacketLogger.warning("Wrong Cube Game Team ID: " + _team); break; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java index 009b836b6d..d72fdfc413 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chddd d: Arena d: Answer @@ -64,7 +65,7 @@ public class RequestExCubeGameReadyAnswer implements IClientIncomingPacket } default: { - LOGGER.warning("Unknown Cube Game Answer ID: " + _answer); + PacketLogger.warning("Unknown Cube Game Answer ID: " + _answer); break; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java index ff12adb20d..3347f01941 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) just a trigger @@ -34,6 +35,6 @@ public class RequestExFishRanking implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestExFishRanking"); + PacketLogger.info("C5: RequestExFishRanking"); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 57e8e7d2e5..8851aef463 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; import org.l2jmobius.gameserver.util.Broadcast; @@ -86,7 +87,7 @@ public class RequestExMagicSkillUseGround implements IClientIncomingPacket else { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("No skill found with id " + _skillId + " and level " + level + " !!"); + PacketLogger.warning("No skill found with id " + _skillId + " and level " + level + " !!"); } } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 77093c5f2d..2d9f0456f4 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; @@ -73,7 +74,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket client.sendPacket(new ExPutEnchantTargetItemResult(0)); if (scrollTemplate == null) { - LOGGER.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); + PacketLogger.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); } return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java index 05e09e6dfc..0a4522bf64 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressMapInfo; @@ -43,7 +44,7 @@ public class RequestFortressMapInfo implements IClientIncomingPacket final Fort fort = FortManager.getInstance().getFortById(_fortressId); if (fort == null) { - LOGGER.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); + PacketLogger.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); if (client.getPlayer() == null) { 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 f65a63d325..dc903790d0 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 @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) d @@ -44,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - LOGGER.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning("Player " + 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/RequestGetItemFromPet.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index 2330851024..fc913f182b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.util.Util; /** @@ -78,7 +79,7 @@ public class RequestGetItemFromPet implements IClientIncomingPacket if (pet.transferItem("Transfer", _objectId, _amount, player.getInventory(), player, pet) == null) { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 66fb839f0e..81d0ee6d55 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; @@ -118,7 +119,7 @@ public class RequestGiveItemToPet implements IClientIncomingPacket if (player.transferItem("Transfer", _objectId, _amount, pet.getInventory(), pet) == null) { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } 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 d0add3fa49..04abcbce46 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 @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaEquipList; @@ -67,7 +68,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.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 fa21b68043..a7c019d65d 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; @@ -52,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - LOGGER.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); } client.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 b943775334..ff96a400c9 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; @@ -50,10 +51,11 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.sendPacket(ActionFailed.STATIC_PACKET); return; } + player.sendPacket(new HennaItemRemoveInfo(henna, player)); } } 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 ab9f0c33f7..89e11ba6a9 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -75,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); client.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 53f04488a6..ada67e190c 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -49,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - LOGGER.warning("Player " + actor.getName() + " sent empty html link!"); + PacketLogger.warning("Player " + actor.getName() + " sent empty html link!"); return; } if (_link.contains("..")) { - LOGGER.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); return; } final int htmlObjectId = actor.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - LOGGER.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java index 89adeae67b..2e1c1c83f6 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author UnAfraid @@ -51,7 +52,7 @@ public class RequestMagicSkillList implements IClientIncomingPacket if (player.getObjectId() != _objectId) { - LOGGER.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); + PacketLogger.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 9432941937..a228079092 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -64,7 +64,7 @@ public class RequestMagicSkillUse implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); // if (_magicId > 0) // { - // LOGGER.warning("Skill Id " + _magicId + " not found in player: " + player); + // PacketLogger.warning("Skill Id " + _magicId + " not found in player: " + player); // } return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 5fbcac0eca..9149ce1284 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListDelete; @@ -71,7 +72,7 @@ public class RequestOustPledgeMember implements IClientIncomingPacket final ClanMember member = clan.getClanMember(_target); if (member == null) { - LOGGER.warning("Target (" + _target + ") is not member of the clan"); + PacketLogger.warning("Target (" + _target + ") is not member of the clan"); return; } if (member.isOnline() && member.getPlayer().isInCombat()) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java index 9702554c3b..209835b319 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) S @@ -37,6 +38,6 @@ public class RequestPCCafeCouponUse implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestPCCafeCouponUse: S: " + _str); + PacketLogger.info("C5: RequestPCCafeCouponUse: S: " + _str); } } 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 e4376f9ad5..14eb0ff29b 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 @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -120,7 +121,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item item = player.checkItemManipulation(i.getId(), i.getCount(), "freight"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); warehouse.deleteMe(); return; } @@ -169,7 +170,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); warehouse.deleteMe(); return; } @@ -177,7 +178,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem("Trade", i.getId(), i.getCount(), warehouse, player, null); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 26cfaf9835..d8b2285a2d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -136,7 +137,7 @@ public class RequestPetUseItem implements IClientIncomingPacket else { player.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM); - LOGGER.warning("No item handler registered for itemId: " + item.getId()); + PacketLogger.warning("No item handler registered for itemId: " + item.getId()); } } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index 8ece2b3ec7..fec0dc36a0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -25,6 +25,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Plim @@ -74,7 +75,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket } catch (SQLException e) { - LOGGER.severe("Error while saving petition feedback"); + PacketLogger.warning("Error while saving petition feedback."); } } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java index d212481717..3459b04c80 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java @@ -44,8 +44,8 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket @Override public void run(GameClient client) { - // LOGGER.info("C5: RequestPledgeMemberInfo d:"+_unk1); - // LOGGER.info("C5: RequestPledgeMemberInfo S:"+_player); + // PacketLogger.info("C5: RequestPledgeMemberInfo d:"+_unk1); + // PacketLogger.info("C5: RequestPledgeMemberInfo S:"+_player); final Player player = client.getPlayer(); if (player == null) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index e56c105cf4..44bbd9d34c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.HashMap; import java.util.Map; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -38,6 +37,7 @@ import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; @@ -74,7 +74,7 @@ public class RequestPreviewItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } @@ -152,7 +152,7 @@ public class RequestPreviewItem implements IClientIncomingPacket final Merchant merchant = (target instanceof Merchant) ? (Merchant) target : null; if (merchant == null) { - LOGGER.warning("Null merchant!"); + PacketLogger.warning(getClass().getSimpleName() + ": Null merchant!"); 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 251757c0ba..94958bc4fe 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.util.Util; @@ -145,7 +146,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if (result > 1) { - LOGGER.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); } return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java index 9998465898..8ab3d4962f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; public class RequestPrivateStoreSell implements IClientIncomingPacket @@ -134,7 +135,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket if (!storeList.privateStoreSell(player, _items)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index a4010ca2cb..1632df189f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -193,7 +194,7 @@ public class RequestRefundItem implements IClientIncomingPacket final Item item = player.getRefund().transferItem("Refund", objectIds[i], Long.MAX_VALUE, player.getInventory(), player, player.getLastFolkNPC()); if (item == null) { - LOGGER.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index ee78579ea4..8a2f42272a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket { @@ -54,7 +55,7 @@ public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket } else { - LOGGER.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); + PacketLogger.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); } player.onTransactionRequest(requestor); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index afc4e65df4..08ad2c7763 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @version $Revision: 1.7.2.3.2.6 $ $Date: 2005/03/27 15:29:30 $ @@ -139,7 +140,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if ((player.getClan() == null) || (player.getClan().getHideoutId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.CLANHALL); @@ -167,7 +168,7 @@ public class RequestRestartPoint implements IClientIncomingPacket } else { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); return; } } @@ -199,7 +200,7 @@ public class RequestRestartPoint implements IClientIncomingPacket final Clan clan = player.getClan(); if ((clan == null) || (clan.getFortId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.FORTRESS); @@ -231,7 +232,7 @@ public class RequestRestartPoint implements IClientIncomingPacket if (((siegeClan == null) || siegeClan.getFlag().isEmpty())) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.SIEGEFLAG); @@ -241,7 +242,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if (!player.isGM() && !player.getInventory().haveItemForSelfResurrection()) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); return; } if (player.isGM() || player.destroyItemByItemId("Feather", 10649, 1, player, false) || player.destroyItemByItemId("Feather", 13300, 1, player, false) || player.destroyItemByItemId("Feather", 13128, 1, player, false)) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 33a10fd20c..5014c0b7d0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExNoticePostSent; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -316,14 +317,14 @@ public class RequestSendPost implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getObjectId(), i.getCount(), "attach"); if ((oldItem == null) || !oldItem.isTradeable() || oldItem.isEquipped()) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); return false; } final Item newItem = player.getInventory().transferItem("SendMail", i.getObjectId(), i.getCount(), attachments, player, msg.getReceiverName() + "[" + msg.getReceiverId() + "]"); if (newItem == null) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java index 2a33016c9a..b5d130046c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -54,16 +55,16 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket final Castle castle = CastleManager.getInstance().getCastleById(_castleId); if ((player == null) || (castle == null)) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); return; } if ((castle.getOwnerId() > 0) && (castle.getOwnerId() != player.getClanId())) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); } else if (!player.isClanLeader()) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); } else if (!castle.isTimeRegistrationOver()) { @@ -79,12 +80,12 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); } } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); } } 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 6d1eea218a..c600906d81 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 @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; @@ -108,7 +109,7 @@ public class Say2 implements IClientIncomingPacket ChatType chatType = ChatType.findByClientId(_type); if (chatType == null) { - LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); + PacketLogger.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -116,7 +117,7 @@ public class Say2 implements IClientIncomingPacket if (_text.isEmpty()) { - LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); + PacketLogger.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -210,7 +211,7 @@ public class Say2 implements IClientIncomingPacket } else { - LOGGER.info("No handler registered for ChatType: " + _type + " Player: " + client); + PacketLogger.info("No handler registered for ChatType: " + _type + " Player: " + client); } } @@ -256,7 +257,7 @@ public class Say2 implements IClientIncomingPacket final Item item = owner.getInventory().getItemByObjectId(id); if (item == null) { - LOGGER.info(client + " trying publish item which doesnt own! ID:" + id); + PacketLogger.info(client + " trying publish item which doesnt own! ID:" + id); return false; } item.publish(); @@ -264,7 +265,7 @@ public class Say2 implements IClientIncomingPacket pos1 = _text.indexOf(8, pos) + 1; if (pos1 == 0) // missing ending tag { - LOGGER.info(client + " sent invalid publish item msg! ID:" + id); + PacketLogger.info(client + " sent invalid publish item msg! ID:" + id); return false; } } 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 ee93527570..7cdde1c7bb 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 @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -127,7 +128,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item item = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); return; } @@ -174,7 +175,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } @@ -186,7 +187,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem(warehouse.getName(), itemHolder.getId(), itemHolder.getCount(), warehouse, player, manager); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 3de872e222..54b59f3ea5 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; @@ -163,13 +164,13 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket final Item oldItem = warehouse.getItemByObjectId(i.getId()); if ((oldItem == null) || (oldItem.getCount() < i.getCount())) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } final Item newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, manager); if (newItem == null) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); return; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 1006dca5ad..d51227574e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUseSharedGroupItem; @@ -282,7 +283,7 @@ public class UseItem implements IClientIncomingPacket { if ((etcItem != null) && (etcItem.getHandlerName() != null)) { - LOGGER.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); + PacketLogger.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); } } else if (handler.useItem(player, item, _ctrlPressed)) 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 9b284cb840..8ca473e613 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; @@ -60,37 +61,37 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - LOGGER.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 30% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 100% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - LOGGER.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - LOGGER.warning("Player " + player + ": Auction House (15-day) Extensión no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); return; } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - LOGGER.warning("Player " + player + ": Auction House (30-day) Extensión no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House (30-day) Extension not found in inventory."); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index b4b5bd9011..e4e46a5271 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -94,7 +95,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning(player + ": tried to crystallize " + item.getItem()); + PacketLogger.warning(player + ": tried to crystallize " + item.getItem()); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index 999f5b7619..d8a8f85043 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward; @@ -62,7 +63,7 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { - LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); + PacketLogger.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java index b12c280c6d..635799d26b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java @@ -18,12 +18,12 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -102,7 +102,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e); + PacketLogger.warning("Could not add friend objectid: " + e.getMessage()); } } else diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java index 2dad174d89..73cd9a6a4b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -26,6 +25,7 @@ import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -99,7 +99,7 @@ public class RequestFriendDel implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not del friend objectid: ", e); + PacketLogger.warning("Could not del friend objectid: " + e.getMessage()); } } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index 8a327f1f9c..ff61b200fb 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.mentoring; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMenteeAdd; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -93,7 +93,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, e.getMessage(), e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java index 18445bd1c5..679dd76226 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.model.clan.ClanRewardBonus; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -77,7 +78,7 @@ public class RequestPledgeBonusReward implements IClientIncomingPacket } else { - LOGGER.warning(player + " Attempting to claim reward but clan(" + clan + ") doesn't have such!"); + PacketLogger.warning(player + " Attempting to claim reward but clan(" + clan + ") doesn't have such!"); } } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java index ee8910d06e..a53878b794 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductList; @@ -60,7 +61,7 @@ public class RequestBRProductList implements IClientIncomingPacket } default: { - LOGGER.warning(player + " send unhandled product list type: " + _type); + PacketLogger.warning(player + " send unhandled product list type: " + _type); break; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java index e1eb0d88df..00a18163da 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.request.SayuneRequest; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.type.SayuneZone; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; @@ -72,7 +73,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (zone.getMapId() == -1) { player.sendMessage("That zone is not supported yet!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); return; } @@ -80,7 +81,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (map == null) { player.sendMessage("This zone is not handled yet!!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java index f1ede4ef0a..41648f184f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Shuttle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -60,7 +61,7 @@ public class RequestShuttleGetOn implements IClientIncomingPacket player.getInVehiclePosition().setXYZ(_x, _y, _z); break; } - LOGGER.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); + PacketLogger.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); } } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 33eeff5060..1b8ddb2042 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -16,11 +16,10 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Level; - import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.util.Util; /** @@ -75,7 +74,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { if (html.length() > 17200) { - LOGGER.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable()); + PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } @@ -94,7 +93,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket if (content == null) { setHtml("My Text is missing:
" + path + ""); - LOGGER.warning("missing html page " + path); + PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index e6b4b8b604..57ed88ac29 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; /** @@ -46,7 +47,7 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index d94dbf4403..75f6596194 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Migi, DS @@ -44,7 +45,7 @@ public class ExReplySentPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index b0f3738683..15d011befc 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author KenM @@ -54,7 +55,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); + PacketLogger.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); packet.writeS(""); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index b27eecaefa..650261e010 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IOutgoingPacket; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; @@ -28,8 +26,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; */ public interface IClientOutgoingPacket extends IOutgoingPacket { - Logger LOGGER = Logger.getLogger(IClientOutgoingPacket.class.getName()); - int[] PAPERDOLL_ORDER = new int[] { Inventory.PAPERDOLL_UNDER, diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 058e1d34b0..818c38a076 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan.SubPledge; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author -Wooden- @@ -56,7 +57,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket } else if (_clan.getClanMember(LeaderId) == null) { - LOGGER.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); + PacketLogger.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); return ""; } else diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index 2d436d0a58..59ec218c84 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.RecipeData; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class RecipeItemMakeInfo implements IClientOutgoingPacket { @@ -58,7 +59,8 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeQ(0x00); return true; } - LOGGER.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); + + PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 432ff8ad7f..0a3fe46cb7 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Shows the Siege Info
@@ -78,7 +79,7 @@ public class SiegeInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Null owner for castle: " + _castle.getName()); + PacketLogger.warning("Null owner for castle: " + _castle.getName()); } } else diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 44f290e92f..746b2da3f7 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; @@ -157,7 +158,7 @@ public class SystemMessage implements IClientOutgoingPacket // Mobius: With additional on-screen damage param (popup), length is increased. if (param.getType() != TYPE_POPUP_ID) { - LOGGER.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); + PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } @@ -414,7 +415,7 @@ public class SystemMessage implements IClientOutgoingPacket { if (param == null) { - LOGGER.warning("Found null parameter for SystemMessageId " + _smId); + PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 64fb395dda..6f57005e47 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -24,6 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class WareHouseWithdrawalList extends AbstractItemPacket { @@ -54,7 +55,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket _invSize = player.getInventory().getSize(); if (_player.getActiveWarehouse() == null) { - LOGGER.warning("error while sending withdraw request to: " + _player.getName()); + PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/PacketLogger.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/PacketLogger.java new file mode 100644 index 0000000000..5b5a083a99 --- /dev/null +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/PacketLogger.java @@ -0,0 +1,42 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.network; + +import java.util.logging.Logger; + +/** + * @author Mobius + */ +public class PacketLogger +{ + private static final Logger LOGGER = Logger.getLogger(PacketLogger.class.getName()); + + public static synchronized void warning(String message) + { + LOGGER.warning(message); + } + + public static synchronized void info(String message) + { + LOGGER.info(message); + } + + public static synchronized void finer(String message) + { + LOGGER.finer(message); + } +} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 7c343f78be..ef3f4acc18 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -161,7 +162,7 @@ public class Action implements IClientIncomingPacket default: { // Invalid action detected (probably client cheating), log this - LOGGER.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); + PacketLogger.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); client.sendPacket(ActionFailed.STATIC_PACKET); break; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index 31d29ef3dd..8e8ae2c190 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; import org.l2jmobius.gameserver.network.serverpackets.TradeOwnAdd; @@ -58,7 +59,7 @@ public class AddTradeItem implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - LOGGER.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); + PacketLogger.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); return; } @@ -68,7 +69,7 @@ public class AddTradeItem implements IClientIncomingPacket // Trade partner not found, cancel trade if (partner != null) { - LOGGER.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); + PacketLogger.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); } player.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE); player.cancelActiveTrade(); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 20134dd2bb..a3236b0d83 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -62,7 +62,7 @@ public class CannotMoveAnymore implements IClientIncomingPacket // player.stopMove(); // // if (Config.DEBUG) - // LOGGER.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ + // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); // StopMove smwl = new StopMove(player); // client.getPlayer().sendPacket(smwl); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 5cc0088afb..cad12977aa 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -43,6 +43,7 @@ import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; import org.l2jmobius.gameserver.network.serverpackets.CharCreateOk; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -124,21 +125,21 @@ public class CharacterCreate implements IClientIncomingPacket if ((_face > 2) || (_face < 0)) { - LOGGER.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairStyle < 0) || ((_sex == 0) && (_hairStyle > 4)) || ((_sex != 0) && (_hairStyle > 6))) { - LOGGER.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairColor > 3) || (_hairColor < 0)) { - LOGGER.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } @@ -303,7 +304,7 @@ public class CharacterCreate implements IClientIncomingPacket final Item item = newChar.getInventory().addItem("Init", ie.getId(), ie.getCount(), newChar, null); if (item == null) { - LOGGER.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); + PacketLogger.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); continue; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java index 86c425fa45..63c3261946 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Level; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.CharacterDeleteFailType; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -25,6 +23,7 @@ import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDelete; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteFail; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteSuccess; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -74,7 +73,7 @@ public class CharacterDelete implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Error:", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1, 0); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java index 5f74c38273..cfe9b20f3d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java @@ -47,7 +47,7 @@ public class EndScenePlayer implements IClientIncomingPacket final MovieHolder holder = player.getMovieHolder(); if ((holder == null) || (holder.getMovie().getClientId() != _movieId)) { - // LOGGER.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); + // PacketLogger.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 4b80180504..68599c55f4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -70,6 +70,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.Die; @@ -158,7 +159,7 @@ public class EnterWorld implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.warning("EnterWorld failed! player returned 'null'."); + PacketLogger.warning("EnterWorld failed! player returned 'null'."); Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java index 8bde20da0a..14e8153478 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java @@ -25,9 +25,13 @@ import org.l2jmobius.gameserver.network.GameClient; */ public class ExGetOnAirShip implements IClientIncomingPacket { + @SuppressWarnings("unused") private int _x; + @SuppressWarnings("unused") private int _y; + @SuppressWarnings("unused") private int _z; + @SuppressWarnings("unused") private int _shipId; @Override @@ -43,9 +47,9 @@ public class ExGetOnAirShip implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("[T1:ExGetOnAirShip] x: " + _x); - LOGGER.info("[T1:ExGetOnAirShip] y: " + _y); - LOGGER.info("[T1:ExGetOnAirShip] z: " + _z); - LOGGER.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); + // PacketLogger.info("[T1:ExGetOnAirShip] x: " + _x); + // PacketLogger.info("[T1:ExGetOnAirShip] y: " + _y); + // PacketLogger.info("[T1:ExGetOnAirShip] z: " + _z); + // PacketLogger.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/ExOpenHtml.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/ExOpenHtml.java index e3e7d17850..062645bc6e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/ExOpenHtml.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/ExOpenHtml.java @@ -21,6 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ExPremiumManagerShowHtml; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -69,7 +70,7 @@ public class ExOpenHtml implements IClientIncomingPacket } default: { - LOGGER.warning("Unknown ExOpenHtml type (" + _type + ")"); + PacketLogger.warning("Unknown ExOpenHtml type (" + _type + ")"); break; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java index fcdd8335f4..4e91188f5c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java @@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Arrays; -import java.util.logging.Level; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: c dddd @@ -79,7 +79,7 @@ public class GameGuardReply implements IClientIncomingPacket } catch (NoSuchAlgorithmException e) { - LOGGER.log(Level.WARNING, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java index eddff9f891..62e69acd86 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.gameserver.network.GameClient; @@ -27,5 +25,4 @@ import org.l2jmobius.gameserver.network.GameClient; */ public interface IClientIncomingPacket extends IIncomingPacket { - Logger LOGGER = Logger.getLogger(IClientIncomingPacket.class.getName()); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index cf3ea246f2..bca34e2fc1 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -153,7 +154,7 @@ public class MultiSellChoose implements IClientIncomingPacket if (((_soulCrystalOptions != null) && CommonUtil.contains(_soulCrystalOptions, null)) || ((_soulCrystalSpecialOptions != null) && CommonUtil.contains(_soulCrystalSpecialOptions, null))) { - LOGGER.severe("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -161,14 +162,14 @@ public class MultiSellChoose implements IClientIncomingPacket final MultisellEntryHolder entry = list.getEntries().get(_entryId - 1); // Entry Id begins from 1. We currently use entry IDs as index pointer. if (entry == null) { - LOGGER.severe("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } if (!entry.isStackable() && (_amount > 1)) { - LOGGER.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -196,7 +197,7 @@ public class MultiSellChoose implements IClientIncomingPacket )) //@formatter:on { - LOGGER.severe("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -368,7 +369,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); return; } } @@ -478,7 +479,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); return; } } @@ -673,7 +674,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); + PacketLogger.warning("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); return false; } } 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 8cb2397383..d3e75ee001 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 @@ -43,6 +43,7 @@ import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillDone; import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; @@ -96,7 +97,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if ((_level < 1) || (_level > 1000) || (_id < 1) || (_id > 64000)) { Util.handleIllegalPlayerAction(player, "Wrong Packet Data in Aquired Skill", Config.DEFAULT_PUNISH); - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); return; } @@ -110,7 +111,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - LOGGER.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -417,7 +418,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket } default: { - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); break; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 52ec7e5132..550735eb12 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillInfo; import org.l2jmobius.gameserver.network.serverpackets.ExAcquireSkillInfo; @@ -54,7 +55,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket { if ((_id <= 0) || (_level <= 0)) { - LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); return; } @@ -73,7 +74,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level); if (skill == null) { - LOGGER.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); + PacketLogger.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); return; } 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 5e0a2af0c9..8078d0c10e 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.Arrays; -import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.ActionData; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; @@ -41,8 +41,6 @@ import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList; */ public class RequestActionUse implements IClientIncomingPacket { - private static final Logger LOGGER = Logger.getLogger(RequestActionUse.class.getName()); - private int _actionId; private boolean _ctrlPressed; private boolean _shiftPressed; @@ -93,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } @@ -107,7 +105,7 @@ public class RequestActionUse implements IClientIncomingPacket actionHandler.useAction(player, actionHolder, _ctrlPressed, _shiftPressed); return; } - LOGGER.warning("Couldnt find handler with name: " + actionHolder.getHandler()); + PacketLogger.warning("Couldn't find handler with name: " + actionHolder.getHandler()); return; } @@ -143,7 +141,7 @@ public class RequestActionUse implements IClientIncomingPacket } default: { - LOGGER.warning(player.getName() + ": unhandled action type " + _actionId); + PacketLogger.warning(player.getName() + ": unhandled action type " + _actionId); break; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java index 1fa1214bea..76649875f1 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.data.xml.FakePlayerData; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -130,7 +131,7 @@ public class RequestBlock implements IClientIncomingPacket } default: { - LOGGER.info("Unknown 0xA9 block type: " + _type); + PacketLogger.info("Unknown 0xA9 block type: " + _type); } } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index eb7e62ebf2..ce3d851f06 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -161,7 +162,7 @@ public class RequestBuyItem implements IClientIncomingPacket long price = product.getPrice(); if (price < 0) { - LOGGER.warning("ERROR, no price found .. wrong buylist ??"); + PacketLogger.warning("ERROR, no price found .. wrong buylist ??"); client.sendPacket(ActionFailed.STATIC_PACKET); 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 a7e3f28ed6..dd5c90fce2 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.StringTokenizer; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -41,6 +40,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -88,7 +88,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -192,7 +192,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (NumberFormatException nfe) { - LOGGER.log(Level.WARNING, "NFE for command [" + _command + "]", nfe); + PacketLogger.warning("NFE for command [" + _command + "] " + nfe.getMessage()); } } else if (_command.startsWith("_match")) @@ -284,13 +284,13 @@ public class RequestBypassToServer implements IClientIncomingPacket } else { - LOGGER.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); + PacketLogger.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); } } } catch (Exception e) { - LOGGER.log(Level.WARNING, "Exception processing bypass from player " + player.getName() + ": " + _command, e); + PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _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/RequestCrystallizeItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 3342e70078..99c633d8ea 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -59,7 +60,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.finer("RequestCrystalizeItem: activeChar was null"); + // PacketLogger.finer("RequestCrystalizeItem: activeChar was null."); return; } @@ -87,7 +88,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - LOGGER.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index fe9f7b3d25..255cd31d6b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; @@ -34,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -171,7 +171,7 @@ public class RequestDestroyItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not delete pet objectid: ", e); + PacketLogger.warning("Could not delete pet objectid: " + e.getMessage()); } } if (itemToRemove.isTimeLimitedItem()) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 0e4b623bb3..b7d4ac63a9 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.GMAudit; import org.l2jmobius.gameserver.util.Util; @@ -210,7 +211,7 @@ public class RequestDropItem implements IClientIncomingPacket if ((dropedItem != null) && (dropedItem.getId() == Inventory.ADENA_ID) && (dropedItem.getCount() >= 1000000)) { final String msg = "Character (" + player.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")"; - LOGGER.warning(msg); + PacketLogger.warning(msg); AdminData.getInstance().broadcastMessageToGMs(msg); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java index e3ab837779..e8bfc249c9 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ExNeedToChangeName; /** @@ -42,6 +43,6 @@ public class RequestExChangeName implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); + PacketLogger.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java index 6e4861568e..c2f02f89ad 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chdd d: Arena d: Team @@ -74,7 +75,7 @@ public class RequestExCubeGameChangeTeam implements IClientIncomingPacket } default: { - LOGGER.warning("Wrong Cube Game Team ID: " + _team); + PacketLogger.warning("Wrong Cube Game Team ID: " + _team); break; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java index 009b836b6d..d72fdfc413 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chddd d: Arena d: Answer @@ -64,7 +65,7 @@ public class RequestExCubeGameReadyAnswer implements IClientIncomingPacket } default: { - LOGGER.warning("Unknown Cube Game Answer ID: " + _answer); + PacketLogger.warning("Unknown Cube Game Answer ID: " + _answer); break; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java index ff12adb20d..3347f01941 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) just a trigger @@ -34,6 +35,6 @@ public class RequestExFishRanking implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestExFishRanking"); + PacketLogger.info("C5: RequestExFishRanking"); } } \ No newline at end of file diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 57e8e7d2e5..8851aef463 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; import org.l2jmobius.gameserver.util.Broadcast; @@ -86,7 +87,7 @@ public class RequestExMagicSkillUseGround implements IClientIncomingPacket else { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("No skill found with id " + _skillId + " and level " + level + " !!"); + PacketLogger.warning("No skill found with id " + _skillId + " and level " + level + " !!"); } } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 77093c5f2d..2d9f0456f4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; @@ -73,7 +74,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket client.sendPacket(new ExPutEnchantTargetItemResult(0)); if (scrollTemplate == null) { - LOGGER.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); + PacketLogger.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); } return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java index 05e09e6dfc..0a4522bf64 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressMapInfo; @@ -43,7 +44,7 @@ public class RequestFortressMapInfo implements IClientIncomingPacket final Fort fort = FortManager.getInstance().getFortById(_fortressId); if (fort == null) { - LOGGER.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); + PacketLogger.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); if (client.getPlayer() == null) { 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 f65a63d325..dc903790d0 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 @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) d @@ -44,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - LOGGER.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning("Player " + 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 d0add3fa49..04abcbce46 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 @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaEquipList; @@ -67,7 +68,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.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 fa21b68043..a7c019d65d 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; @@ -52,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - LOGGER.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); } client.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 b943775334..ff96a400c9 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; @@ -50,10 +51,11 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.sendPacket(ActionFailed.STATIC_PACKET); return; } + player.sendPacket(new HennaItemRemoveInfo(henna, player)); } } 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 ab9f0c33f7..89e11ba6a9 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -75,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); client.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 53f04488a6..ada67e190c 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -49,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - LOGGER.warning("Player " + actor.getName() + " sent empty html link!"); + PacketLogger.warning("Player " + actor.getName() + " sent empty html link!"); return; } if (_link.contains("..")) { - LOGGER.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); return; } final int htmlObjectId = actor.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - LOGGER.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java index 89adeae67b..2e1c1c83f6 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author UnAfraid @@ -51,7 +52,7 @@ public class RequestMagicSkillList implements IClientIncomingPacket if (player.getObjectId() != _objectId) { - LOGGER.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); + PacketLogger.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 9432941937..a228079092 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -64,7 +64,7 @@ public class RequestMagicSkillUse implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); // if (_magicId > 0) // { - // LOGGER.warning("Skill Id " + _magicId + " not found in player: " + player); + // PacketLogger.warning("Skill Id " + _magicId + " not found in player: " + player); // } return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 8566204a33..e5beb36b37 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListDelete; @@ -71,7 +72,7 @@ public class RequestOustPledgeMember implements IClientIncomingPacket final ClanMember member = clan.getClanMember(_target); if (member == null) { - LOGGER.warning("Target (" + _target + ") is not member of the clan"); + PacketLogger.warning("Target (" + _target + ") is not member of the clan"); return; } if (member.isOnline() && member.getPlayer().isInCombat()) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java index 9702554c3b..209835b319 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) S @@ -37,6 +38,6 @@ public class RequestPCCafeCouponUse implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestPCCafeCouponUse: S: " + _str); + PacketLogger.info("C5: RequestPCCafeCouponUse: S: " + _str); } } 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 4d3adf25dc..e8de8fee2a 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 @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -113,7 +114,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item item = player.checkItemManipulation(i.getId(), i.getCount(), "freight"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); warehouse.deleteMe(); return; } @@ -162,7 +163,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); warehouse.deleteMe(); return; } @@ -170,7 +171,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem("Trade", i.getId(), i.getCount(), warehouse, player, null); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index 8ece2b3ec7..fec0dc36a0 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -25,6 +25,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Plim @@ -74,7 +75,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket } catch (SQLException e) { - LOGGER.severe("Error while saving petition feedback"); + PacketLogger.warning("Error while saving petition feedback."); } } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java index d212481717..3459b04c80 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java @@ -44,8 +44,8 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket @Override public void run(GameClient client) { - // LOGGER.info("C5: RequestPledgeMemberInfo d:"+_unk1); - // LOGGER.info("C5: RequestPledgeMemberInfo S:"+_player); + // PacketLogger.info("C5: RequestPledgeMemberInfo d:"+_unk1); + // PacketLogger.info("C5: RequestPledgeMemberInfo S:"+_player); final Player player = client.getPlayer(); if (player == null) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index e56c105cf4..44bbd9d34c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.HashMap; import java.util.Map; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -38,6 +37,7 @@ import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; @@ -74,7 +74,7 @@ public class RequestPreviewItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } @@ -152,7 +152,7 @@ public class RequestPreviewItem implements IClientIncomingPacket final Merchant merchant = (target instanceof Merchant) ? (Merchant) target : null; if (merchant == null) { - LOGGER.warning("Null merchant!"); + PacketLogger.warning(getClass().getSimpleName() + ": Null merchant!"); 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 251757c0ba..94958bc4fe 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.util.Util; @@ -145,7 +146,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if (result > 1) { - LOGGER.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); } return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java index 9998465898..8ab3d4962f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; public class RequestPrivateStoreSell implements IClientIncomingPacket @@ -134,7 +135,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket if (!storeList.privateStoreSell(player, _items)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index a4010ca2cb..1632df189f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -193,7 +194,7 @@ public class RequestRefundItem implements IClientIncomingPacket final Item item = player.getRefund().transferItem("Refund", objectIds[i], Long.MAX_VALUE, player.getInventory(), player, player.getLastFolkNPC()); if (item == null) { - LOGGER.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index ee78579ea4..8a2f42272a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket { @@ -54,7 +55,7 @@ public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket } else { - LOGGER.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); + PacketLogger.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); } player.onTransactionRequest(requestor); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index afc4e65df4..08ad2c7763 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @version $Revision: 1.7.2.3.2.6 $ $Date: 2005/03/27 15:29:30 $ @@ -139,7 +140,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if ((player.getClan() == null) || (player.getClan().getHideoutId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.CLANHALL); @@ -167,7 +168,7 @@ public class RequestRestartPoint implements IClientIncomingPacket } else { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); return; } } @@ -199,7 +200,7 @@ public class RequestRestartPoint implements IClientIncomingPacket final Clan clan = player.getClan(); if ((clan == null) || (clan.getFortId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.FORTRESS); @@ -231,7 +232,7 @@ public class RequestRestartPoint implements IClientIncomingPacket if (((siegeClan == null) || siegeClan.getFlag().isEmpty())) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.SIEGEFLAG); @@ -241,7 +242,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if (!player.isGM() && !player.getInventory().haveItemForSelfResurrection()) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); return; } if (player.isGM() || player.destroyItemByItemId("Feather", 10649, 1, player, false) || player.destroyItemByItemId("Feather", 13300, 1, player, false) || player.destroyItemByItemId("Feather", 13128, 1, player, false)) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index cd8e900014..3582b308eb 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExNoticePostSent; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -316,14 +317,14 @@ public class RequestSendPost implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getObjectId(), i.getCount(), "attach"); if ((oldItem == null) || !oldItem.isTradeable() || oldItem.isEquipped()) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); return false; } final Item newItem = player.getInventory().transferItem("SendMail", i.getObjectId(), i.getCount(), attachments, player, msg.getReceiverName() + "[" + msg.getReceiverId() + "]"); if (newItem == null) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java index 2a33016c9a..b5d130046c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -54,16 +55,16 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket final Castle castle = CastleManager.getInstance().getCastleById(_castleId); if ((player == null) || (castle == null)) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); return; } if ((castle.getOwnerId() > 0) && (castle.getOwnerId() != player.getClanId())) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); } else if (!player.isClanLeader()) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); } else if (!castle.isTimeRegistrationOver()) { @@ -79,12 +80,12 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); } } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); } } 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 88a9e1c787..f17566d545 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 @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; @@ -112,7 +113,7 @@ public class Say2 implements IClientIncomingPacket ChatType chatType = ChatType.findByClientId(_type); if (chatType == null) { - LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); + PacketLogger.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -120,7 +121,7 @@ public class Say2 implements IClientIncomingPacket if (_text.isEmpty()) { - LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); + PacketLogger.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -214,7 +215,7 @@ public class Say2 implements IClientIncomingPacket } else { - LOGGER.info("No handler registered for ChatType: " + _type + " Player: " + client); + PacketLogger.info("No handler registered for ChatType: " + _type + " Player: " + client); } } @@ -260,7 +261,7 @@ public class Say2 implements IClientIncomingPacket final Item item = owner.getInventory().getItemByObjectId(id); if (item == null) { - LOGGER.info(client + " trying publish item which doesnt own! ID:" + id); + PacketLogger.info(client + " trying publish item which doesnt own! ID:" + id); return false; } item.publish(); @@ -268,7 +269,7 @@ public class Say2 implements IClientIncomingPacket pos1 = _text.indexOf(8, pos) + 1; if (pos1 == 0) // missing ending tag { - LOGGER.info(client + " sent invalid publish item msg! ID:" + id); + PacketLogger.info(client + " sent invalid publish item msg! ID:" + id); return false; } } 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 f89be1cfcb..84b879e0f7 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 @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -127,7 +128,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item item = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); return; } @@ -174,7 +175,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } @@ -186,7 +187,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem(warehouse.getName(), itemHolder.getId(), itemHolder.getCount(), warehouse, player, manager); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 1b5eb14605..984b90ec48 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; @@ -156,14 +157,14 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket final Item oldItem = warehouse.getItemByObjectId(i.getId()); if ((oldItem == null) || (oldItem.getCount() < i.getCount())) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } final Item newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, player.getLastFolkNPC()); if (newItem == null) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); return; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index f74fcd67b2..96f0d966ac 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExShowVariationMakeWindow; @@ -282,7 +283,7 @@ public class UseItem implements IClientIncomingPacket { if ((etcItem != null) && (etcItem.getHandlerName() != null)) { - LOGGER.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); + PacketLogger.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); } } else if (handler.useItem(player, item, _ctrlPressed)) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java index 6ca772677f..263932baea 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.model.ElementalSpirit; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.PlaySound; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; @@ -66,7 +67,7 @@ public class ExRequestClassChange implements IClientIncomingPacket } if (!canChange) { - LOGGER.warning(player + " tried to change class from " + player.getClassId() + " to " + ClassId.getClassId(_classId) + "!"); + PacketLogger.warning(player + " tried to change class from " + player.getClassId() + " to " + ClassId.getClassId(_classId) + "!"); 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 20d84a2bd6..6b2f96e87d 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; @@ -60,37 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - LOGGER.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 30% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 100% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - LOGGER.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - - LOGGER.warning("Player " + player + ": Auction House (15-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); return; - } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - LOGGER.warning("Player " + player + ": Auction House (30-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + 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/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index f9db76f0c4..0100c0113d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -94,7 +95,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning(player + ": tried to crystallize " + item.getItem()); + PacketLogger.warning(player + ": tried to crystallize " + item.getItem()); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index 999f5b7619..d8a8f85043 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward; @@ -62,7 +63,7 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { - LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); + PacketLogger.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index f668f20dcb..80f672c54e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets.ensoul; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnsoulData; import org.l2jmobius.gameserver.enums.PrivateStoreType; @@ -28,6 +26,7 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -39,7 +38,6 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; */ public class RequestItemEnsoul implements IClientIncomingPacket { - private static final Logger LOGGER = Logger.getLogger(RequestItemEnsoul.class.getName()); private int _itemObjectId; private EnsoulItemOption[] _options; @@ -119,37 +117,37 @@ public class RequestItemEnsoul implements IClientIncomingPacket final Item item = player.getInventory().getItemByObjectId(_itemObjectId); if (item == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item without having it!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item without having it!"); return; } if (!item.isEquipable()) { - LOGGER.warning("Player: " + player + " attempting to ensoul non equippable item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul non equippable item: " + item + "!"); return; } if (!item.isWeapon()) { - LOGGER.warning("Player: " + player + " attempting to ensoul item that's not a weapon: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item that's not a weapon: " + item + "!"); return; } if (item.isCommonItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul common item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul common item: " + item + "!"); return; } if (item.isShadowItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul shadow item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul shadow item: " + item + "!"); return; } if (item.isHeroItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul hero item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul hero item: " + item + "!"); return; } if ((_options == null) || (_options.length == 0)) { - LOGGER.warning("Player: " + player + " attempting to ensoul item without any special ability declared!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item without any special ability declared!"); return; } @@ -173,14 +171,14 @@ public class RequestItemEnsoul implements IClientIncomingPacket if (!stone.getOptions().contains(itemOption.getSoulCrystalOption())) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that stone doesn't contains!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that stone doesn't contains!"); continue; } final EnsoulOption option = EnsoulData.getInstance().getOption(itemOption.getSoulCrystalOption()); if (option == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that doesn't exists!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that doesn't exists!"); continue; } @@ -205,13 +203,13 @@ public class RequestItemEnsoul implements IClientIncomingPacket } else { - LOGGER.warning("Player: " + player + " attempting to ensoul item option with unhandled type: " + itemOption.getType() + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option with unhandled type: " + itemOption.getType() + "!"); continue; } if (fee == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that doesn't exists! (unknown fee)"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that doesn't exists! (unknown fee)"); continue; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java index b12c280c6d..635799d26b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java @@ -18,12 +18,12 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -102,7 +102,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e); + PacketLogger.warning("Could not add friend objectid: " + e.getMessage()); } } else diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java index 2dad174d89..73cd9a6a4b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -26,6 +25,7 @@ import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -99,7 +99,7 @@ public class RequestFriendDel implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not del friend objectid: ", e); + PacketLogger.warning("Could not del friend objectid: " + e.getMessage()); } } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index ff8eb57629..e4ad042344 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.mentoring; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -28,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMenteeAdd; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -91,7 +91,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, e.getMessage(), e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGetItemFromPet.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGetItemFromPet.java index fee0b270a5..e230a05384 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGetItemFromPet.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGetItemFromPet.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.pet.PetItemList; import org.l2jmobius.gameserver.util.Util; @@ -85,7 +86,7 @@ public class RequestGetItemFromPet implements IClientIncomingPacket } else { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGiveItemToPet.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGiveItemToPet.java index 13512321f5..6f8d5bb3ea 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGiveItemToPet.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGiveItemToPet.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.pet.PetItemList; @@ -125,7 +126,7 @@ public class RequestGiveItemToPet implements IClientIncomingPacket } else { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetUseItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetUseItem.java index a3e449b1cc..e0abde33bb 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetUseItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetUseItem.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -138,7 +139,7 @@ public class RequestPetUseItem implements IClientIncomingPacket else { player.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM); - LOGGER.warning("No item handler registered for itemId: " + item.getId()); + PacketLogger.warning("No item handler registered for itemId: " + item.getId()); } } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java index 18445bd1c5..679dd76226 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.model.clan.ClanRewardBonus; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -77,7 +78,7 @@ public class RequestPledgeBonusReward implements IClientIncomingPacket } else { - LOGGER.warning(player + " Attempting to claim reward but clan(" + clan + ") doesn't have such!"); + PacketLogger.warning(player + " Attempting to claim reward but clan(" + clan + ") doesn't have such!"); } } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java index ee8910d06e..a53878b794 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductList; @@ -60,7 +61,7 @@ public class RequestBRProductList implements IClientIncomingPacket } default: { - LOGGER.warning(player + " send unhandled product list type: " + _type); + PacketLogger.warning(player + " send unhandled product list type: " + _type); break; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java index 10c89bed0e..f29aabd0cb 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java @@ -51,7 +51,7 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket } else { - // LOGGER.warning("Could not find spawn info for boss " + bossId + "."); + // PacketLogger.warning("Could not find spawn info for boss " + bossId + "."); } } else diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java index 1c6488efd4..21aa8f4169 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.request.SayuneRequest; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.type.SayuneZone; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; @@ -71,7 +72,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (zone.getMapId() == -1) { player.sendMessage("That zone is not supported yet!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); return; } @@ -79,7 +80,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (map == null) { player.sendMessage("This zone is not handled yet!!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java index f1ede4ef0a..41648f184f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Shuttle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -60,7 +61,7 @@ public class RequestShuttleGetOn implements IClientIncomingPacket player.getInVehiclePosition().setXYZ(_x, _y, _z); break; } - LOGGER.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); + PacketLogger.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); } } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleport.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleport.java index fbbfdaf5b9..b8bad1a58e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleport.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleport.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; @@ -57,7 +58,7 @@ public class ExRequestTeleport implements IClientIncomingPacket final TeleportListHolder teleport = TeleportListData.getInstance().getTeleport(_teleportId); if (teleport == null) { - LOGGER.warning("No registered teleport location for id: " + _teleportId); + PacketLogger.warning("No registered teleport location for id: " + _teleportId); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoritesAddDel.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoritesAddDel.java index a5b01e87b5..50f4b4d87d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoritesAddDel.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoritesAddDel.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.data.xml.TeleportListData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -53,7 +54,7 @@ public class ExRequestTeleportFavoritesAddDel implements IClientIncomingPacket if (TeleportListData.getInstance().getTeleport(_teleportId) == null) { - LOGGER.warning("No registered teleport location for id: " + _teleportId); + PacketLogger.warning("No registered teleport location for id: " + _teleportId); return; } @@ -62,7 +63,7 @@ public class ExRequestTeleportFavoritesAddDel implements IClientIncomingPacket { if (TeleportListData.getInstance().getTeleport(_teleportId) == null) { - LOGGER.warning("No registered teleport location for id: " + _teleportId); + PacketLogger.warning("No registered teleport location for id: " + _teleportId); } else { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java index 38d06e16ed..03e69980fa 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java @@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.teleports.ExRaidTeleportInfo; @@ -65,7 +66,7 @@ public class ExTeleportToRaidPosition implements IClientIncomingPacket final TeleportListHolder teleport = RaidTeleportListData.getInstance().getTeleport(_raidId); if (teleport == null) { - LOGGER.warning("No registered teleport location for raid id: " + _raidId); + PacketLogger.warning("No registered teleport location for raid id: " + _raidId); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 33eeff5060..1b8ddb2042 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -16,11 +16,10 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Level; - import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.util.Util; /** @@ -75,7 +74,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { if (html.length() > 17200) { - LOGGER.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable()); + PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } @@ -94,7 +93,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket if (content == null) { setHtml("My Text is missing:
" + path + ""); - LOGGER.warning("missing html page " + path); + PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index e6b4b8b604..57ed88ac29 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; /** @@ -46,7 +47,7 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index d94dbf4403..75f6596194 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Migi, DS @@ -44,7 +45,7 @@ public class ExReplySentPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index b0f3738683..15d011befc 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author KenM @@ -54,7 +55,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); + PacketLogger.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); packet.writeS(""); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index d588f1c7cf..b5c8628b50 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IOutgoingPacket; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; @@ -28,8 +26,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; */ public interface IClientOutgoingPacket extends IOutgoingPacket { - Logger LOGGER = Logger.getLogger(IClientOutgoingPacket.class.getName()); - int[] PAPERDOLL_ORDER = new int[] { Inventory.PAPERDOLL_UNDER, diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 058e1d34b0..818c38a076 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan.SubPledge; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author -Wooden- @@ -56,7 +57,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket } else if (_clan.getClanMember(LeaderId) == null) { - LOGGER.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); + PacketLogger.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); return ""; } else diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index 2d436d0a58..59ec218c84 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.RecipeData; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class RecipeItemMakeInfo implements IClientOutgoingPacket { @@ -58,7 +59,8 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeQ(0x00); return true; } - LOGGER.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); + + PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 432ff8ad7f..0a3fe46cb7 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Shows the Siege Info
@@ -78,7 +79,7 @@ public class SiegeInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Null owner for castle: " + _castle.getName()); + PacketLogger.warning("Null owner for castle: " + _castle.getName()); } } else diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 4ed2ccc9b6..55902e07e1 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; @@ -158,7 +159,7 @@ public class SystemMessage implements IClientOutgoingPacket // Mobius: With additional on-screen damage param (popup), length is increased. if (param.getType() != TYPE_POPUP_ID) { - LOGGER.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); + PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } @@ -421,7 +422,7 @@ public class SystemMessage implements IClientOutgoingPacket { if (param == null) { - LOGGER.warning("Found null parameter for SystemMessageId " + _smId); + PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 37150ec357..7af1cd273c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -24,6 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class WareHouseWithdrawalList extends AbstractItemPacket { @@ -56,7 +57,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket _invSize = player.getInventory().getSize(); if (_player.getActiveWarehouse() == null) { - LOGGER.warning("error while sending withdraw request to: " + _player.getName()); + PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java index a63178770a..d1896f32a7 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.instancemanager.RankManager; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; /** @@ -134,7 +135,7 @@ public class ExOlympiadHeroAndLegendInfo implements IClientOutgoingPacket } catch (SQLException e) { - LOGGER.warning("Hero and Legend Info: Couldnt load data: " + e.getMessage()); + PacketLogger.warning("Hero and Legend Info: Couldnt load data: " + e.getMessage()); } } return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java index 710d957175..b7395dee4e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; /** @@ -96,7 +97,7 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket } catch (SQLException e) { - LOGGER.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); + PacketLogger.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); } int previousPlace = 0; @@ -125,7 +126,7 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket } catch (SQLException e) { - LOGGER.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); + PacketLogger.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); } int heroCount = 0; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/PacketLogger.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/PacketLogger.java new file mode 100644 index 0000000000..5b5a083a99 --- /dev/null +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/PacketLogger.java @@ -0,0 +1,42 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.network; + +import java.util.logging.Logger; + +/** + * @author Mobius + */ +public class PacketLogger +{ + private static final Logger LOGGER = Logger.getLogger(PacketLogger.class.getName()); + + public static synchronized void warning(String message) + { + LOGGER.warning(message); + } + + public static synchronized void info(String message) + { + LOGGER.info(message); + } + + public static synchronized void finer(String message) + { + LOGGER.finer(message); + } +} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 7c343f78be..ef3f4acc18 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -161,7 +162,7 @@ public class Action implements IClientIncomingPacket default: { // Invalid action detected (probably client cheating), log this - LOGGER.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); + PacketLogger.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); client.sendPacket(ActionFailed.STATIC_PACKET); break; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index 31d29ef3dd..8e8ae2c190 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; import org.l2jmobius.gameserver.network.serverpackets.TradeOwnAdd; @@ -58,7 +59,7 @@ public class AddTradeItem implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - LOGGER.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); + PacketLogger.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); return; } @@ -68,7 +69,7 @@ public class AddTradeItem implements IClientIncomingPacket // Trade partner not found, cancel trade if (partner != null) { - LOGGER.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); + PacketLogger.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); } player.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE); player.cancelActiveTrade(); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 20134dd2bb..a3236b0d83 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -62,7 +62,7 @@ public class CannotMoveAnymore implements IClientIncomingPacket // player.stopMove(); // // if (Config.DEBUG) - // LOGGER.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ + // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); // StopMove smwl = new StopMove(player); // client.getPlayer().sendPacket(smwl); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 379ce7e1ee..138fe803d8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -43,6 +43,7 @@ import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; import org.l2jmobius.gameserver.network.serverpackets.CharCreateOk; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -124,21 +125,21 @@ public class CharacterCreate implements IClientIncomingPacket if ((_face > 2) || (_face < 0)) { - LOGGER.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairStyle < 0) || ((_sex == 0) && (_hairStyle > 4)) || ((_sex != 0) && (_hairStyle > 6))) { - LOGGER.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairColor > 3) || (_hairColor < 0)) { - LOGGER.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } @@ -312,7 +313,7 @@ public class CharacterCreate implements IClientIncomingPacket final Item item = newChar.getInventory().addItem("Init", ie.getId(), ie.getCount(), newChar, null); if (item == null) { - LOGGER.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); + PacketLogger.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); continue; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java index 86c425fa45..63c3261946 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Level; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.CharacterDeleteFailType; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -25,6 +23,7 @@ import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDelete; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteFail; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteSuccess; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -74,7 +73,7 @@ public class CharacterDelete implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Error:", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1, 0); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java index 5f74c38273..cfe9b20f3d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java @@ -47,7 +47,7 @@ public class EndScenePlayer implements IClientIncomingPacket final MovieHolder holder = player.getMovieHolder(); if ((holder == null) || (holder.getMovie().getClientId() != _movieId)) { - // LOGGER.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); + // PacketLogger.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 148829e225..ce6c8cd50c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -70,6 +70,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.Die; @@ -162,7 +163,7 @@ public class EnterWorld implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.warning("EnterWorld failed! player returned 'null'."); + PacketLogger.warning("EnterWorld failed! player returned 'null'."); Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java index 8bde20da0a..14e8153478 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java @@ -25,9 +25,13 @@ import org.l2jmobius.gameserver.network.GameClient; */ public class ExGetOnAirShip implements IClientIncomingPacket { + @SuppressWarnings("unused") private int _x; + @SuppressWarnings("unused") private int _y; + @SuppressWarnings("unused") private int _z; + @SuppressWarnings("unused") private int _shipId; @Override @@ -43,9 +47,9 @@ public class ExGetOnAirShip implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("[T1:ExGetOnAirShip] x: " + _x); - LOGGER.info("[T1:ExGetOnAirShip] y: " + _y); - LOGGER.info("[T1:ExGetOnAirShip] z: " + _z); - LOGGER.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); + // PacketLogger.info("[T1:ExGetOnAirShip] x: " + _x); + // PacketLogger.info("[T1:ExGetOnAirShip] y: " + _y); + // PacketLogger.info("[T1:ExGetOnAirShip] z: " + _z); + // PacketLogger.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExOpenHtml.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExOpenHtml.java index 4f21a4e70a..75f39586b1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExOpenHtml.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ExOpenHtml.java @@ -21,6 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ExPremiumManagerShowHtml; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -77,7 +78,7 @@ public class ExOpenHtml implements IClientIncomingPacket // } default: { - LOGGER.warning("Unknown ExOpenHtml type (" + _type + ")"); + PacketLogger.warning("Unknown ExOpenHtml type (" + _type + ")"); break; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java index fcdd8335f4..4e91188f5c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java @@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Arrays; -import java.util.logging.Level; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: c dddd @@ -79,7 +79,7 @@ public class GameGuardReply implements IClientIncomingPacket } catch (NoSuchAlgorithmException e) { - LOGGER.log(Level.WARNING, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java index eddff9f891..62e69acd86 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.gameserver.network.GameClient; @@ -27,5 +25,4 @@ import org.l2jmobius.gameserver.network.GameClient; */ public interface IClientIncomingPacket extends IIncomingPacket { - Logger LOGGER = Logger.getLogger(IClientIncomingPacket.class.getName()); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 881fa14e23..0cc8fa64de 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -153,7 +154,7 @@ public class MultiSellChoose implements IClientIncomingPacket if (((_soulCrystalOptions != null) && CommonUtil.contains(_soulCrystalOptions, null)) || ((_soulCrystalSpecialOptions != null) && CommonUtil.contains(_soulCrystalSpecialOptions, null))) { - LOGGER.severe("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -161,14 +162,14 @@ public class MultiSellChoose implements IClientIncomingPacket final MultisellEntryHolder entry = list.getEntries().get(_entryId - 1); // Entry Id begins from 1. We currently use entry IDs as index pointer. if (entry == null) { - LOGGER.severe("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } if (!entry.isStackable() && (_amount > 1)) { - LOGGER.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -196,7 +197,7 @@ public class MultiSellChoose implements IClientIncomingPacket )) //@formatter:on { - LOGGER.severe("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -372,7 +373,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); return; } } @@ -487,7 +488,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); return; } } @@ -691,7 +692,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); + PacketLogger.warning("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); return false; } } 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 8cb2397383..d3e75ee001 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 @@ -43,6 +43,7 @@ import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillDone; import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; @@ -96,7 +97,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if ((_level < 1) || (_level > 1000) || (_id < 1) || (_id > 64000)) { Util.handleIllegalPlayerAction(player, "Wrong Packet Data in Aquired Skill", Config.DEFAULT_PUNISH); - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); return; } @@ -110,7 +111,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - LOGGER.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -417,7 +418,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket } default: { - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); break; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 52ec7e5132..550735eb12 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillInfo; import org.l2jmobius.gameserver.network.serverpackets.ExAcquireSkillInfo; @@ -54,7 +55,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket { if ((_id <= 0) || (_level <= 0)) { - LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); return; } @@ -73,7 +74,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level); if (skill == null) { - LOGGER.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); + PacketLogger.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); return; } 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 5e0a2af0c9..8078d0c10e 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.Arrays; -import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.ActionData; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; @@ -41,8 +41,6 @@ import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList; */ public class RequestActionUse implements IClientIncomingPacket { - private static final Logger LOGGER = Logger.getLogger(RequestActionUse.class.getName()); - private int _actionId; private boolean _ctrlPressed; private boolean _shiftPressed; @@ -93,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } @@ -107,7 +105,7 @@ public class RequestActionUse implements IClientIncomingPacket actionHandler.useAction(player, actionHolder, _ctrlPressed, _shiftPressed); return; } - LOGGER.warning("Couldnt find handler with name: " + actionHolder.getHandler()); + PacketLogger.warning("Couldn't find handler with name: " + actionHolder.getHandler()); return; } @@ -143,7 +141,7 @@ public class RequestActionUse implements IClientIncomingPacket } default: { - LOGGER.warning(player.getName() + ": unhandled action type " + _actionId); + PacketLogger.warning(player.getName() + ": unhandled action type " + _actionId); break; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java index 1fa1214bea..76649875f1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.data.xml.FakePlayerData; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -130,7 +131,7 @@ public class RequestBlock implements IClientIncomingPacket } default: { - LOGGER.info("Unknown 0xA9 block type: " + _type); + PacketLogger.info("Unknown 0xA9 block type: " + _type); } } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index eb7e62ebf2..ce3d851f06 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -161,7 +162,7 @@ public class RequestBuyItem implements IClientIncomingPacket long price = product.getPrice(); if (price < 0) { - LOGGER.warning("ERROR, no price found .. wrong buylist ??"); + PacketLogger.warning("ERROR, no price found .. wrong buylist ??"); client.sendPacket(ActionFailed.STATIC_PACKET); 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 a7e3f28ed6..dd5c90fce2 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.StringTokenizer; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -41,6 +40,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -88,7 +88,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -192,7 +192,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (NumberFormatException nfe) { - LOGGER.log(Level.WARNING, "NFE for command [" + _command + "]", nfe); + PacketLogger.warning("NFE for command [" + _command + "] " + nfe.getMessage()); } } else if (_command.startsWith("_match")) @@ -284,13 +284,13 @@ public class RequestBypassToServer implements IClientIncomingPacket } else { - LOGGER.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); + PacketLogger.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); } } } catch (Exception e) { - LOGGER.log(Level.WARNING, "Exception processing bypass from player " + player.getName() + ": " + _command, e); + PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _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/RequestCrystallizeItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 3342e70078..99c633d8ea 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -59,7 +60,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.finer("RequestCrystalizeItem: activeChar was null"); + // PacketLogger.finer("RequestCrystalizeItem: activeChar was null."); return; } @@ -87,7 +88,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - LOGGER.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index fe9f7b3d25..255cd31d6b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; @@ -34,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -171,7 +171,7 @@ public class RequestDestroyItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not delete pet objectid: ", e); + PacketLogger.warning("Could not delete pet objectid: " + e.getMessage()); } } if (itemToRemove.isTimeLimitedItem()) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 0e4b623bb3..b7d4ac63a9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.GMAudit; import org.l2jmobius.gameserver.util.Util; @@ -210,7 +211,7 @@ public class RequestDropItem implements IClientIncomingPacket if ((dropedItem != null) && (dropedItem.getId() == Inventory.ADENA_ID) && (dropedItem.getCount() >= 1000000)) { final String msg = "Character (" + player.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")"; - LOGGER.warning(msg); + PacketLogger.warning(msg); AdminData.getInstance().broadcastMessageToGMs(msg); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java index e3ab837779..e8bfc249c9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ExNeedToChangeName; /** @@ -42,6 +43,6 @@ public class RequestExChangeName implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); + PacketLogger.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java index 6e4861568e..c2f02f89ad 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chdd d: Arena d: Team @@ -74,7 +75,7 @@ public class RequestExCubeGameChangeTeam implements IClientIncomingPacket } default: { - LOGGER.warning("Wrong Cube Game Team ID: " + _team); + PacketLogger.warning("Wrong Cube Game Team ID: " + _team); break; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java index 009b836b6d..d72fdfc413 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chddd d: Arena d: Answer @@ -64,7 +65,7 @@ public class RequestExCubeGameReadyAnswer implements IClientIncomingPacket } default: { - LOGGER.warning("Unknown Cube Game Answer ID: " + _answer); + PacketLogger.warning("Unknown Cube Game Answer ID: " + _answer); break; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java index ff12adb20d..3347f01941 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) just a trigger @@ -34,6 +35,6 @@ public class RequestExFishRanking implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestExFishRanking"); + PacketLogger.info("C5: RequestExFishRanking"); } } \ No newline at end of file diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 57e8e7d2e5..8851aef463 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; import org.l2jmobius.gameserver.util.Broadcast; @@ -86,7 +87,7 @@ public class RequestExMagicSkillUseGround implements IClientIncomingPacket else { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("No skill found with id " + _skillId + " and level " + level + " !!"); + PacketLogger.warning("No skill found with id " + _skillId + " and level " + level + " !!"); } } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 77093c5f2d..2d9f0456f4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; @@ -73,7 +74,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket client.sendPacket(new ExPutEnchantTargetItemResult(0)); if (scrollTemplate == null) { - LOGGER.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); + PacketLogger.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); } return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java index 05e09e6dfc..0a4522bf64 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressMapInfo; @@ -43,7 +44,7 @@ public class RequestFortressMapInfo implements IClientIncomingPacket final Fort fort = FortManager.getInstance().getFortById(_fortressId); if (fort == null) { - LOGGER.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); + PacketLogger.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); if (client.getPlayer() == null) { 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 f65a63d325..dc903790d0 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 @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) d @@ -44,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - LOGGER.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning("Player " + 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 d0add3fa49..04abcbce46 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 @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaEquipList; @@ -67,7 +68,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.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 fa21b68043..a7c019d65d 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; @@ -52,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - LOGGER.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); } client.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 b943775334..ff96a400c9 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; @@ -50,10 +51,11 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.sendPacket(ActionFailed.STATIC_PACKET); return; } + player.sendPacket(new HennaItemRemoveInfo(henna, player)); } } 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 ab9f0c33f7..89e11ba6a9 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -75,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); client.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 53f04488a6..ada67e190c 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -49,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - LOGGER.warning("Player " + actor.getName() + " sent empty html link!"); + PacketLogger.warning("Player " + actor.getName() + " sent empty html link!"); return; } if (_link.contains("..")) { - LOGGER.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); return; } final int htmlObjectId = actor.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - LOGGER.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java index 89adeae67b..2e1c1c83f6 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author UnAfraid @@ -51,7 +52,7 @@ public class RequestMagicSkillList implements IClientIncomingPacket if (player.getObjectId() != _objectId) { - LOGGER.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); + PacketLogger.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 9432941937..a228079092 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -64,7 +64,7 @@ public class RequestMagicSkillUse implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); // if (_magicId > 0) // { - // LOGGER.warning("Skill Id " + _magicId + " not found in player: " + player); + // PacketLogger.warning("Skill Id " + _magicId + " not found in player: " + player); // } return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 8566204a33..e5beb36b37 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListDelete; @@ -71,7 +72,7 @@ public class RequestOustPledgeMember implements IClientIncomingPacket final ClanMember member = clan.getClanMember(_target); if (member == null) { - LOGGER.warning("Target (" + _target + ") is not member of the clan"); + PacketLogger.warning("Target (" + _target + ") is not member of the clan"); return; } if (member.isOnline() && member.getPlayer().isInCombat()) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java index 9702554c3b..209835b319 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) S @@ -37,6 +38,6 @@ public class RequestPCCafeCouponUse implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestPCCafeCouponUse: S: " + _str); + PacketLogger.info("C5: RequestPCCafeCouponUse: S: " + _str); } } 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 4d3adf25dc..e8de8fee2a 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 @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -113,7 +114,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item item = player.checkItemManipulation(i.getId(), i.getCount(), "freight"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); warehouse.deleteMe(); return; } @@ -162,7 +163,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); warehouse.deleteMe(); return; } @@ -170,7 +171,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem("Trade", i.getId(), i.getCount(), warehouse, player, null); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index 8ece2b3ec7..fec0dc36a0 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -25,6 +25,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Plim @@ -74,7 +75,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket } catch (SQLException e) { - LOGGER.severe("Error while saving petition feedback"); + PacketLogger.warning("Error while saving petition feedback."); } } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java index d212481717..3459b04c80 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java @@ -44,8 +44,8 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket @Override public void run(GameClient client) { - // LOGGER.info("C5: RequestPledgeMemberInfo d:"+_unk1); - // LOGGER.info("C5: RequestPledgeMemberInfo S:"+_player); + // PacketLogger.info("C5: RequestPledgeMemberInfo d:"+_unk1); + // PacketLogger.info("C5: RequestPledgeMemberInfo S:"+_player); final Player player = client.getPlayer(); if (player == null) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index e56c105cf4..44bbd9d34c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.HashMap; import java.util.Map; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -38,6 +37,7 @@ import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; @@ -74,7 +74,7 @@ public class RequestPreviewItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } @@ -152,7 +152,7 @@ public class RequestPreviewItem implements IClientIncomingPacket final Merchant merchant = (target instanceof Merchant) ? (Merchant) target : null; if (merchant == null) { - LOGGER.warning("Null merchant!"); + PacketLogger.warning(getClass().getSimpleName() + ": Null merchant!"); 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 251757c0ba..94958bc4fe 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.util.Util; @@ -145,7 +146,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if (result > 1) { - LOGGER.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); } return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java index 9998465898..8ab3d4962f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; public class RequestPrivateStoreSell implements IClientIncomingPacket @@ -134,7 +135,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket if (!storeList.privateStoreSell(player, _items)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index a4010ca2cb..1632df189f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -193,7 +194,7 @@ public class RequestRefundItem implements IClientIncomingPacket final Item item = player.getRefund().transferItem("Refund", objectIds[i], Long.MAX_VALUE, player.getInventory(), player, player.getLastFolkNPC()); if (item == null) { - LOGGER.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index ee78579ea4..8a2f42272a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket { @@ -54,7 +55,7 @@ public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket } else { - LOGGER.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); + PacketLogger.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); } player.onTransactionRequest(requestor); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index afc4e65df4..08ad2c7763 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @version $Revision: 1.7.2.3.2.6 $ $Date: 2005/03/27 15:29:30 $ @@ -139,7 +140,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if ((player.getClan() == null) || (player.getClan().getHideoutId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.CLANHALL); @@ -167,7 +168,7 @@ public class RequestRestartPoint implements IClientIncomingPacket } else { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); return; } } @@ -199,7 +200,7 @@ public class RequestRestartPoint implements IClientIncomingPacket final Clan clan = player.getClan(); if ((clan == null) || (clan.getFortId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.FORTRESS); @@ -231,7 +232,7 @@ public class RequestRestartPoint implements IClientIncomingPacket if (((siegeClan == null) || siegeClan.getFlag().isEmpty())) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.SIEGEFLAG); @@ -241,7 +242,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if (!player.isGM() && !player.getInventory().haveItemForSelfResurrection()) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); return; } if (player.isGM() || player.destroyItemByItemId("Feather", 10649, 1, player, false) || player.destroyItemByItemId("Feather", 13300, 1, player, false) || player.destroyItemByItemId("Feather", 13128, 1, player, false)) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index cd8e900014..3582b308eb 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExNoticePostSent; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -316,14 +317,14 @@ public class RequestSendPost implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getObjectId(), i.getCount(), "attach"); if ((oldItem == null) || !oldItem.isTradeable() || oldItem.isEquipped()) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); return false; } final Item newItem = player.getInventory().transferItem("SendMail", i.getObjectId(), i.getCount(), attachments, player, msg.getReceiverName() + "[" + msg.getReceiverId() + "]"); if (newItem == null) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java index 2a33016c9a..b5d130046c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -54,16 +55,16 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket final Castle castle = CastleManager.getInstance().getCastleById(_castleId); if ((player == null) || (castle == null)) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); return; } if ((castle.getOwnerId() > 0) && (castle.getOwnerId() != player.getClanId())) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); } else if (!player.isClanLeader()) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); } else if (!castle.isTimeRegistrationOver()) { @@ -79,12 +80,12 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); } } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); } } 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 88a9e1c787..f17566d545 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 @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; @@ -112,7 +113,7 @@ public class Say2 implements IClientIncomingPacket ChatType chatType = ChatType.findByClientId(_type); if (chatType == null) { - LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); + PacketLogger.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -120,7 +121,7 @@ public class Say2 implements IClientIncomingPacket if (_text.isEmpty()) { - LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); + PacketLogger.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -214,7 +215,7 @@ public class Say2 implements IClientIncomingPacket } else { - LOGGER.info("No handler registered for ChatType: " + _type + " Player: " + client); + PacketLogger.info("No handler registered for ChatType: " + _type + " Player: " + client); } } @@ -260,7 +261,7 @@ public class Say2 implements IClientIncomingPacket final Item item = owner.getInventory().getItemByObjectId(id); if (item == null) { - LOGGER.info(client + " trying publish item which doesnt own! ID:" + id); + PacketLogger.info(client + " trying publish item which doesnt own! ID:" + id); return false; } item.publish(); @@ -268,7 +269,7 @@ public class Say2 implements IClientIncomingPacket pos1 = _text.indexOf(8, pos) + 1; if (pos1 == 0) // missing ending tag { - LOGGER.info(client + " sent invalid publish item msg! ID:" + id); + PacketLogger.info(client + " sent invalid publish item msg! ID:" + id); return false; } } 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 f89be1cfcb..84b879e0f7 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 @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -127,7 +128,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item item = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); return; } @@ -174,7 +175,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } @@ -186,7 +187,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem(warehouse.getName(), itemHolder.getId(), itemHolder.getCount(), warehouse, player, manager); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index cff7284f2f..7224f6c56b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; @@ -156,14 +157,14 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket final Item oldItem = warehouse.getItemByObjectId(i.getId()); if ((oldItem == null) || (oldItem.getCount() < i.getCount())) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } final Item newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, player.getLastFolkNPC()); if (newItem == null) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); return; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index d3b33be1bb..4b9b76d898 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -46,6 +46,7 @@ import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExShowVariationMakeWindow; @@ -292,7 +293,7 @@ public class UseItem implements IClientIncomingPacket { if ((etcItem != null) && (etcItem.getHandlerName() != null)) { - LOGGER.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); + PacketLogger.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); } } else if (handler.useItem(player, item, _ctrlPressed)) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java index 615bf22813..2741ea8ca5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.model.ElementalSpirit; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.PlaySound; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; @@ -66,7 +67,7 @@ public class ExRequestClassChange implements IClientIncomingPacket } if (!canChange) { - LOGGER.warning(player + " tried to change class from " + player.getClassId() + " to " + ClassId.getClassId(_classId) + "!"); + PacketLogger.warning(player + " tried to change class from " + player.getClassId() + " to " + ClassId.getClassId(_classId) + "!"); 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 20d84a2bd6..6b2f96e87d 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; @@ -60,37 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - LOGGER.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 30% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 100% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - LOGGER.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - - LOGGER.warning("Player " + player + ": Auction House (15-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); return; - } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - LOGGER.warning("Player " + player + ": Auction House (30-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + 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/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index f9db76f0c4..0100c0113d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -94,7 +95,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning(player + ": tried to crystallize " + item.getItem()); + PacketLogger.warning(player + ": tried to crystallize " + item.getItem()); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index 999f5b7619..d8a8f85043 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward; @@ -62,7 +63,7 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { - LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); + PacketLogger.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index f668f20dcb..80f672c54e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets.ensoul; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnsoulData; import org.l2jmobius.gameserver.enums.PrivateStoreType; @@ -28,6 +26,7 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -39,7 +38,6 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; */ public class RequestItemEnsoul implements IClientIncomingPacket { - private static final Logger LOGGER = Logger.getLogger(RequestItemEnsoul.class.getName()); private int _itemObjectId; private EnsoulItemOption[] _options; @@ -119,37 +117,37 @@ public class RequestItemEnsoul implements IClientIncomingPacket final Item item = player.getInventory().getItemByObjectId(_itemObjectId); if (item == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item without having it!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item without having it!"); return; } if (!item.isEquipable()) { - LOGGER.warning("Player: " + player + " attempting to ensoul non equippable item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul non equippable item: " + item + "!"); return; } if (!item.isWeapon()) { - LOGGER.warning("Player: " + player + " attempting to ensoul item that's not a weapon: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item that's not a weapon: " + item + "!"); return; } if (item.isCommonItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul common item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul common item: " + item + "!"); return; } if (item.isShadowItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul shadow item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul shadow item: " + item + "!"); return; } if (item.isHeroItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul hero item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul hero item: " + item + "!"); return; } if ((_options == null) || (_options.length == 0)) { - LOGGER.warning("Player: " + player + " attempting to ensoul item without any special ability declared!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item without any special ability declared!"); return; } @@ -173,14 +171,14 @@ public class RequestItemEnsoul implements IClientIncomingPacket if (!stone.getOptions().contains(itemOption.getSoulCrystalOption())) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that stone doesn't contains!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that stone doesn't contains!"); continue; } final EnsoulOption option = EnsoulData.getInstance().getOption(itemOption.getSoulCrystalOption()); if (option == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that doesn't exists!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that doesn't exists!"); continue; } @@ -205,13 +203,13 @@ public class RequestItemEnsoul implements IClientIncomingPacket } else { - LOGGER.warning("Player: " + player + " attempting to ensoul item option with unhandled type: " + itemOption.getType() + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option with unhandled type: " + itemOption.getType() + "!"); continue; } if (fee == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that doesn't exists! (unknown fee)"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that doesn't exists! (unknown fee)"); continue; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java index b12c280c6d..635799d26b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java @@ -18,12 +18,12 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -102,7 +102,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e); + PacketLogger.warning("Could not add friend objectid: " + e.getMessage()); } } else diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java index 2dad174d89..73cd9a6a4b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -26,6 +25,7 @@ import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -99,7 +99,7 @@ public class RequestFriendDel implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not del friend objectid: ", e); + PacketLogger.warning("Could not del friend objectid: " + e.getMessage()); } } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index ff8eb57629..e4ad042344 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.mentoring; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -28,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMenteeAdd; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -91,7 +91,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, e.getMessage(), e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGetItemFromPet.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGetItemFromPet.java index fee0b270a5..e230a05384 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGetItemFromPet.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGetItemFromPet.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.pet.PetItemList; import org.l2jmobius.gameserver.util.Util; @@ -85,7 +86,7 @@ public class RequestGetItemFromPet implements IClientIncomingPacket } else { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGiveItemToPet.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGiveItemToPet.java index 13512321f5..6f8d5bb3ea 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGiveItemToPet.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGiveItemToPet.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.pet.PetItemList; @@ -125,7 +126,7 @@ public class RequestGiveItemToPet implements IClientIncomingPacket } else { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetUseItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetUseItem.java index a3e449b1cc..e0abde33bb 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetUseItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetUseItem.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -138,7 +139,7 @@ public class RequestPetUseItem implements IClientIncomingPacket else { player.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM); - LOGGER.warning("No item handler registered for itemId: " + item.getId()); + PacketLogger.warning("No item handler registered for itemId: " + item.getId()); } } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java index 2065a0e803..793a3a0387 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.clan.ClanRewardBonus; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -71,7 +72,7 @@ public class RequestPledgeBonusReward implements IClientIncomingPacket } else { - LOGGER.warning(player + " Attempting to claim reward but clan(" + clan + ") doesn't have such!"); + PacketLogger.warning(player + " Attempting to claim reward but clan(" + clan + ") doesn't have such!"); } } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java index ee8910d06e..a53878b794 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductList; @@ -60,7 +61,7 @@ public class RequestBRProductList implements IClientIncomingPacket } default: { - LOGGER.warning(player + " send unhandled product list type: " + _type); + PacketLogger.warning(player + " send unhandled product list type: " + _type); break; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java index 10c89bed0e..f29aabd0cb 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java @@ -51,7 +51,7 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket } else { - // LOGGER.warning("Could not find spawn info for boss " + bossId + "."); + // PacketLogger.warning("Could not find spawn info for boss " + bossId + "."); } } else diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java index 1c6488efd4..21aa8f4169 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.request.SayuneRequest; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.type.SayuneZone; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; @@ -71,7 +72,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (zone.getMapId() == -1) { player.sendMessage("That zone is not supported yet!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); return; } @@ -79,7 +80,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (map == null) { player.sendMessage("This zone is not handled yet!!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java index f1ede4ef0a..41648f184f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Shuttle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -60,7 +61,7 @@ public class RequestShuttleGetOn implements IClientIncomingPacket player.getInVehiclePosition().setXYZ(_x, _y, _z); break; } - LOGGER.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); + PacketLogger.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); } } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleport.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleport.java index dcf86e38ee..f86087edee 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleport.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleport.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; @@ -58,7 +59,7 @@ public class ExRequestTeleport implements IClientIncomingPacket final TeleportListHolder teleport = TeleportListData.getInstance().getTeleport(_teleportId); if (teleport == null) { - LOGGER.warning("No registered teleport location for id: " + _teleportId); + PacketLogger.warning("No registered teleport location for id: " + _teleportId); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoritesAddDel.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoritesAddDel.java index a5b01e87b5..50f4b4d87d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoritesAddDel.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoritesAddDel.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.data.xml.TeleportListData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -53,7 +54,7 @@ public class ExRequestTeleportFavoritesAddDel implements IClientIncomingPacket if (TeleportListData.getInstance().getTeleport(_teleportId) == null) { - LOGGER.warning("No registered teleport location for id: " + _teleportId); + PacketLogger.warning("No registered teleport location for id: " + _teleportId); return; } @@ -62,7 +63,7 @@ public class ExRequestTeleportFavoritesAddDel implements IClientIncomingPacket { if (TeleportListData.getInstance().getTeleport(_teleportId) == null) { - LOGGER.warning("No registered teleport location for id: " + _teleportId); + PacketLogger.warning("No registered teleport location for id: " + _teleportId); } else { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java index 38d06e16ed..03e69980fa 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java @@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.teleports.ExRaidTeleportInfo; @@ -65,7 +66,7 @@ public class ExTeleportToRaidPosition implements IClientIncomingPacket final TeleportListHolder teleport = RaidTeleportListData.getInstance().getTeleport(_raidId); if (teleport == null) { - LOGGER.warning("No registered teleport location for raid id: " + _raidId); + PacketLogger.warning("No registered teleport location for raid id: " + _raidId); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 33eeff5060..1b8ddb2042 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -16,11 +16,10 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Level; - import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.util.Util; /** @@ -75,7 +74,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { if (html.length() > 17200) { - LOGGER.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable()); + PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } @@ -94,7 +93,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket if (content == null) { setHtml("My Text is missing:
" + path + ""); - LOGGER.warning("missing html page " + path); + PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index e6b4b8b604..57ed88ac29 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; /** @@ -46,7 +47,7 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index d94dbf4403..75f6596194 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Migi, DS @@ -44,7 +45,7 @@ public class ExReplySentPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index b0f3738683..15d011befc 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author KenM @@ -54,7 +55,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); + PacketLogger.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); packet.writeS(""); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index d588f1c7cf..b5c8628b50 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IOutgoingPacket; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; @@ -28,8 +26,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; */ public interface IClientOutgoingPacket extends IOutgoingPacket { - Logger LOGGER = Logger.getLogger(IClientOutgoingPacket.class.getName()); - int[] PAPERDOLL_ORDER = new int[] { Inventory.PAPERDOLL_UNDER, diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 058e1d34b0..818c38a076 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan.SubPledge; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author -Wooden- @@ -56,7 +57,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket } else if (_clan.getClanMember(LeaderId) == null) { - LOGGER.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); + PacketLogger.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); return ""; } else diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index 2d436d0a58..59ec218c84 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.RecipeData; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class RecipeItemMakeInfo implements IClientOutgoingPacket { @@ -58,7 +59,8 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeQ(0x00); return true; } - LOGGER.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); + + PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 432ff8ad7f..0a3fe46cb7 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Shows the Siege Info
@@ -78,7 +79,7 @@ public class SiegeInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Null owner for castle: " + _castle.getName()); + PacketLogger.warning("Null owner for castle: " + _castle.getName()); } } else diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 4ed2ccc9b6..55902e07e1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; @@ -158,7 +159,7 @@ public class SystemMessage implements IClientOutgoingPacket // Mobius: With additional on-screen damage param (popup), length is increased. if (param.getType() != TYPE_POPUP_ID) { - LOGGER.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); + PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } @@ -421,7 +422,7 @@ public class SystemMessage implements IClientOutgoingPacket { if (param == null) { - LOGGER.warning("Found null parameter for SystemMessageId " + _smId); + PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 37150ec357..7af1cd273c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -24,6 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class WareHouseWithdrawalList extends AbstractItemPacket { @@ -56,7 +57,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket _invSize = player.getInventory().getSize(); if (_player.getActiveWarehouse() == null) { - LOGGER.warning("error while sending withdraw request to: " + _player.getName()); + PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java index a63178770a..d1896f32a7 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.instancemanager.RankManager; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; /** @@ -134,7 +135,7 @@ public class ExOlympiadHeroAndLegendInfo implements IClientOutgoingPacket } catch (SQLException e) { - LOGGER.warning("Hero and Legend Info: Couldnt load data: " + e.getMessage()); + PacketLogger.warning("Hero and Legend Info: Couldnt load data: " + e.getMessage()); } } return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java index 710d957175..b7395dee4e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; /** @@ -96,7 +97,7 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket } catch (SQLException e) { - LOGGER.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); + PacketLogger.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); } int previousPlace = 0; @@ -125,7 +126,7 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket } catch (SQLException e) { - LOGGER.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); + PacketLogger.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); } int heroCount = 0; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/PacketLogger.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/PacketLogger.java new file mode 100644 index 0000000000..5b5a083a99 --- /dev/null +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/PacketLogger.java @@ -0,0 +1,42 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.network; + +import java.util.logging.Logger; + +/** + * @author Mobius + */ +public class PacketLogger +{ + private static final Logger LOGGER = Logger.getLogger(PacketLogger.class.getName()); + + public static synchronized void warning(String message) + { + LOGGER.warning(message); + } + + public static synchronized void info(String message) + { + LOGGER.info(message); + } + + public static synchronized void finer(String message) + { + LOGGER.finer(message); + } +} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index 7c343f78be..ef3f4acc18 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -161,7 +162,7 @@ public class Action implements IClientIncomingPacket default: { // Invalid action detected (probably client cheating), log this - LOGGER.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); + PacketLogger.warning(getClass().getSimpleName() + ": Character: " + player.getName() + " requested invalid action: " + _actionId); client.sendPacket(ActionFailed.STATIC_PACKET); break; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index 31d29ef3dd..8e8ae2c190 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; import org.l2jmobius.gameserver.network.serverpackets.TradeOwnAdd; @@ -58,7 +59,7 @@ public class AddTradeItem implements IClientIncomingPacket final TradeList trade = player.getActiveTradeList(); if (trade == null) { - LOGGER.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); + PacketLogger.warning("Character: " + player.getName() + " requested item:" + _objectId + " add without active tradelist:" + _tradeId); return; } @@ -68,7 +69,7 @@ public class AddTradeItem implements IClientIncomingPacket // Trade partner not found, cancel trade if (partner != null) { - LOGGER.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); + PacketLogger.warning("Character:" + player.getName() + " requested invalid trade object: " + _objectId); } player.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE); player.cancelActiveTrade(); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java index 20134dd2bb..a3236b0d83 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java @@ -62,7 +62,7 @@ public class CannotMoveAnymore implements IClientIncomingPacket // player.stopMove(); // // if (Config.DEBUG) - // LOGGER.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ + // PacketLogger.finer("client: x:"+_x+" y:"+_y+" z:"+_z+ // " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ()); // StopMove smwl = new StopMove(player); // client.getPlayer().sendPacket(smwl); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 379ce7e1ee..138fe803d8 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -43,6 +43,7 @@ import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; import org.l2jmobius.gameserver.network.serverpackets.CharCreateOk; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -124,21 +125,21 @@ public class CharacterCreate implements IClientIncomingPacket if ((_face > 2) || (_face < 0)) { - LOGGER.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character face " + _face + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairStyle < 0) || ((_sex == 0) && (_hairStyle > 4)) || ((_sex != 0) && (_hairStyle > 6))) { - LOGGER.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair style " + _hairStyle + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } if ((_hairColor > 3) || (_hairColor < 0)) { - LOGGER.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); + PacketLogger.warning("Character Creation Failure: Character hair color " + _hairColor + " is invalid. Possible client hack. " + client); client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); return; } @@ -312,7 +313,7 @@ public class CharacterCreate implements IClientIncomingPacket final Item item = newChar.getInventory().addItem("Init", ie.getId(), ie.getCount(), newChar, null); if (item == null) { - LOGGER.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); + PacketLogger.warning("Could not create item during char creation: itemId " + ie.getId() + ", amount " + ie.getCount() + "."); continue; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java index 86c425fa45..63c3261946 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Level; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.CharacterDeleteFailType; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -25,6 +23,7 @@ import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDelete; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteFail; import org.l2jmobius.gameserver.network.serverpackets.CharDeleteSuccess; import org.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo; @@ -74,7 +73,7 @@ public class CharacterDelete implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "Error:", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1, 0); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java index 5f74c38273..cfe9b20f3d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java @@ -47,7 +47,7 @@ public class EndScenePlayer implements IClientIncomingPacket final MovieHolder holder = player.getMovieHolder(); if ((holder == null) || (holder.getMovie().getClientId() != _movieId)) { - // LOGGER.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); + // PacketLogger.warning("Player " + client + " sent EndScenePlayer with wrong movie id: " + _movieId); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 148829e225..ce6c8cd50c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -70,6 +70,7 @@ import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.ConnectionState; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.Die; @@ -162,7 +163,7 @@ public class EnterWorld implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.warning("EnterWorld failed! player returned 'null'."); + PacketLogger.warning("EnterWorld failed! player returned 'null'."); Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java index 8bde20da0a..14e8153478 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java @@ -25,9 +25,13 @@ import org.l2jmobius.gameserver.network.GameClient; */ public class ExGetOnAirShip implements IClientIncomingPacket { + @SuppressWarnings("unused") private int _x; + @SuppressWarnings("unused") private int _y; + @SuppressWarnings("unused") private int _z; + @SuppressWarnings("unused") private int _shipId; @Override @@ -43,9 +47,9 @@ public class ExGetOnAirShip implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("[T1:ExGetOnAirShip] x: " + _x); - LOGGER.info("[T1:ExGetOnAirShip] y: " + _y); - LOGGER.info("[T1:ExGetOnAirShip] z: " + _z); - LOGGER.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); + // PacketLogger.info("[T1:ExGetOnAirShip] x: " + _x); + // PacketLogger.info("[T1:ExGetOnAirShip] y: " + _y); + // PacketLogger.info("[T1:ExGetOnAirShip] z: " + _z); + // PacketLogger.info("[T1:ExGetOnAirShip] ship ID: " + _shipId); } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/ExOpenHtml.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/ExOpenHtml.java index 4f21a4e70a..75f39586b1 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/ExOpenHtml.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/ExOpenHtml.java @@ -21,6 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ExPremiumManagerShowHtml; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -77,7 +78,7 @@ public class ExOpenHtml implements IClientIncomingPacket // } default: { - LOGGER.warning("Unknown ExOpenHtml type (" + _type + ")"); + PacketLogger.warning("Unknown ExOpenHtml type (" + _type + ")"); break; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java index fcdd8335f4..4e91188f5c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java @@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Arrays; -import java.util.logging.Level; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: c dddd @@ -79,7 +79,7 @@ public class GameGuardReply implements IClientIncomingPacket } catch (NoSuchAlgorithmException e) { - LOGGER.log(Level.WARNING, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java index eddff9f891..62e69acd86 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.gameserver.network.GameClient; @@ -27,5 +25,4 @@ import org.l2jmobius.gameserver.network.GameClient; */ public interface IClientIncomingPacket extends IIncomingPacket { - Logger LOGGER = Logger.getLogger(IClientIncomingPacket.class.getName()); } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 881fa14e23..0cc8fa64de 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -153,7 +154,7 @@ public class MultiSellChoose implements IClientIncomingPacket if (((_soulCrystalOptions != null) && CommonUtil.contains(_soulCrystalOptions, null)) || ((_soulCrystalSpecialOptions != null) && CommonUtil.contains(_soulCrystalSpecialOptions, null))) { - LOGGER.severe("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested multisell entry with invalid soul crystal options. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -161,14 +162,14 @@ public class MultiSellChoose implements IClientIncomingPacket final MultisellEntryHolder entry = list.getEntries().get(_entryId - 1); // Entry Id begins from 1. We currently use entry IDs as index pointer. if (entry == null) { - LOGGER.severe("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " requested inexistant prepared multisell entry. Multisell: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } if (!entry.isStackable() && (_amount > 1)) { - LOGGER.severe("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to set amount > 1 on non-stackable multisell. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -196,7 +197,7 @@ public class MultiSellChoose implements IClientIncomingPacket )) //@formatter:on { - LOGGER.severe("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); + PacketLogger.warning("Character: " + player.getName() + " is trying to upgrade equippable item, but the stats doesn't match. Id: " + _listId + " entry: " + _entryId); player.setMultiSell(null); return; } @@ -372,7 +373,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special ingredient with id: " + ingredient.getId() + "."); return; } } @@ -487,7 +488,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); + PacketLogger.warning("Character: " + player.getName() + " has suffered possible item loss by using multisell " + _listId + " which has non-implemented special product with id: " + product.getId() + "."); return; } } @@ -691,7 +692,7 @@ public class MultiSellChoose implements IClientIncomingPacket } default: { - LOGGER.severe("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); + PacketLogger.warning("Multisell: " + _listId + " is using a non-implemented special ingredient with id: " + ingredientId + "."); return false; } } 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 8cb2397383..d3e75ee001 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 @@ -43,6 +43,7 @@ import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillDone; import org.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass; @@ -96,7 +97,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket if ((_level < 1) || (_level > 1000) || (_id < 1) || (_id > 64000)) { Util.handleIllegalPlayerAction(player, "Wrong Packet Data in Aquired Skill", Config.DEFAULT_PUNISH); - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill - id: " + _id + " level: " + _level + " for " + player); return; } @@ -110,7 +111,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level, existingSkill == null ? 0 : existingSkill.getSubLevel()); if (skill == null) { - LOGGER.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkill.class.getSimpleName() + ": Player " + player.getName() + " is trying to learn a null skill Id: " + _id + " level: " + _level + "!"); return; } @@ -417,7 +418,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket } default: { - LOGGER.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); + PacketLogger.warning("Recived Wrong Packet Data in Aquired Skill, unknown skill type:" + _skillType); break; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 52ec7e5132..550735eb12 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillInfo; import org.l2jmobius.gameserver.network.serverpackets.ExAcquireSkillInfo; @@ -54,7 +55,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket { if ((_id <= 0) || (_level <= 0)) { - LOGGER.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); + PacketLogger.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Invalid Id: " + _id + " or level: " + _level + "!"); return; } @@ -73,7 +74,7 @@ public class RequestAcquireSkillInfo implements IClientIncomingPacket final Skill skill = SkillData.getInstance().getSkill(_id, _level); if (skill == null) { - LOGGER.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); + PacketLogger.warning("Skill Id: " + _id + " level: " + _level + " is undefined. " + RequestAcquireSkillInfo.class.getName() + " failed."); return; } 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 5e0a2af0c9..8078d0c10e 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.Arrays; -import java.util.logging.Logger; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.ActionData; @@ -30,6 +29,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.model.skill.BuffInfo; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; @@ -41,8 +41,6 @@ import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList; */ public class RequestActionUse implements IClientIncomingPacket { - private static final Logger LOGGER = Logger.getLogger(RequestActionUse.class.getName()); - private int _actionId; private boolean _ctrlPressed; private boolean _shiftPressed; @@ -93,7 +91,7 @@ public class RequestActionUse implements IClientIncomingPacket if (Arrays.binarySearch(allowedActions, _actionId) < 0) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); + PacketLogger.warning("Player " + player + " used action which he does not have! Id = " + _actionId + " transform: " + player.getTransformation().get().getId()); return; } } @@ -107,7 +105,7 @@ public class RequestActionUse implements IClientIncomingPacket actionHandler.useAction(player, actionHolder, _ctrlPressed, _shiftPressed); return; } - LOGGER.warning("Couldnt find handler with name: " + actionHolder.getHandler()); + PacketLogger.warning("Couldn't find handler with name: " + actionHolder.getHandler()); return; } @@ -143,7 +141,7 @@ public class RequestActionUse implements IClientIncomingPacket } default: { - LOGGER.warning(player.getName() + ": unhandled action type " + _actionId); + PacketLogger.warning(player.getName() + ": unhandled action type " + _actionId); break; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java index 1fa1214bea..76649875f1 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestBlock.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.data.xml.FakePlayerData; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -130,7 +131,7 @@ public class RequestBlock implements IClientIncomingPacket } default: { - LOGGER.info("Unknown 0xA9 block type: " + _type); + PacketLogger.info("Unknown 0xA9 block type: " + _type); } } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index eb7e62ebf2..ce3d851f06 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -161,7 +162,7 @@ public class RequestBuyItem implements IClientIncomingPacket long price = product.getPrice(); if (price < 0) { - LOGGER.warning("ERROR, no price found .. wrong buylist ??"); + PacketLogger.warning("ERROR, no price found .. wrong buylist ??"); client.sendPacket(ActionFailed.STATIC_PACKET); 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 a7e3f28ed6..dd5c90fce2 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 @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.StringTokenizer; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -41,6 +40,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -88,7 +88,7 @@ public class RequestBypassToServer implements IClientIncomingPacket if (_command.isEmpty()) { - LOGGER.warning("Player " + player.getName() + " sent empty bypass!"); + PacketLogger.warning("Player " + player.getName() + " sent empty bypass!"); Disconnection.of(client, player).defaultSequence(LeaveWorld.STATIC_PACKET); return; } @@ -192,7 +192,7 @@ public class RequestBypassToServer implements IClientIncomingPacket } catch (NumberFormatException nfe) { - LOGGER.log(Level.WARNING, "NFE for command [" + _command + "]", nfe); + PacketLogger.warning("NFE for command [" + _command + "] " + nfe.getMessage()); } } else if (_command.startsWith("_match")) @@ -284,13 +284,13 @@ public class RequestBypassToServer implements IClientIncomingPacket } else { - LOGGER.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); + PacketLogger.warning(client + " sent not handled RequestBypassToServer: [" + _command + "]"); } } } catch (Exception e) { - LOGGER.log(Level.WARNING, "Exception processing bypass from player " + player.getName() + ": " + _command, e); + PacketLogger.warning("Exception processing bypass from player " + player.getName() + ": " + _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/RequestCrystallizeItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 3342e70078..99c633d8ea 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -59,7 +60,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket final Player player = client.getPlayer(); if (player == null) { - LOGGER.finer("RequestCrystalizeItem: activeChar was null"); + // PacketLogger.finer("RequestCrystalizeItem: activeChar was null."); return; } @@ -87,7 +88,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if ((player.getRace() != Race.DWARF) && (player.getClassId().getId() != 117) && (player.getClassId().getId() != 55)) { - LOGGER.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); + PacketLogger.info("Player " + player + " used crystalize with classid: " + player.getClassId().getId()); } return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index fe9f7b3d25..255cd31d6b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; @@ -34,6 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -171,7 +171,7 @@ public class RequestDestroyItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not delete pet objectid: ", e); + PacketLogger.warning("Could not delete pet objectid: " + e.getMessage()); } } if (itemToRemove.isTimeLimitedItem()) diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 0e4b623bb3..b7d4ac63a9 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.GMAudit; import org.l2jmobius.gameserver.util.Util; @@ -210,7 +211,7 @@ public class RequestDropItem implements IClientIncomingPacket if ((dropedItem != null) && (dropedItem.getId() == Inventory.ADENA_ID) && (dropedItem.getCount() >= 1000000)) { final String msg = "Character (" + player.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")"; - LOGGER.warning(msg); + PacketLogger.warning(msg); AdminData.getInstance().broadcastMessageToGMs(msg); } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java index e3ab837779..e8bfc249c9 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ExNeedToChangeName; /** @@ -42,6 +43,6 @@ public class RequestExChangeName implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); + PacketLogger.info("Recieved " + getClass().getSimpleName() + " name: " + _newName + " type: " + _type + " CharSlot: " + _charSlot); } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java index 6e4861568e..c2f02f89ad 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chdd d: Arena d: Team @@ -74,7 +75,7 @@ public class RequestExCubeGameChangeTeam implements IClientIncomingPacket } default: { - LOGGER.warning("Wrong Cube Game Team ID: " + _team); + PacketLogger.warning("Wrong Cube Game Team ID: " + _team); break; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java index 009b836b6d..d72fdfc413 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: chddd d: Arena d: Answer @@ -64,7 +65,7 @@ public class RequestExCubeGameReadyAnswer implements IClientIncomingPacket } default: { - LOGGER.warning("Unknown Cube Game Answer ID: " + _answer); + PacketLogger.warning("Unknown Cube Game Answer ID: " + _answer); break; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java index ff12adb20d..3347f01941 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) just a trigger @@ -34,6 +35,6 @@ public class RequestExFishRanking implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestExFishRanking"); + PacketLogger.info("C5: RequestExFishRanking"); } } \ No newline at end of file diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 57e8e7d2e5..8851aef463 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ValidateLocation; import org.l2jmobius.gameserver.util.Broadcast; @@ -86,7 +87,7 @@ public class RequestExMagicSkillUseGround implements IClientIncomingPacket else { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("No skill found with id " + _skillId + " and level " + level + " !!"); + PacketLogger.warning("No skill found with id " + _skillId + " and level " + level + " !!"); } } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 77093c5f2d..2d9f0456f4 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; @@ -73,7 +74,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket client.sendPacket(new ExPutEnchantTargetItemResult(0)); if (scrollTemplate == null) { - LOGGER.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); + PacketLogger.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); } return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java index 05e09e6dfc..0a4522bf64 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExShowFortressMapInfo; @@ -43,7 +44,7 @@ public class RequestFortressMapInfo implements IClientIncomingPacket final Fort fort = FortManager.getInstance().getFortById(_fortressId); if (fort == null) { - LOGGER.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); + PacketLogger.warning("Fort is not found with id (" + _fortressId + ") in all forts with size of (" + FortManager.getInstance().getForts().size() + ") called by player (" + client.getPlayer() + ")"); if (client.getPlayer() == null) { 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 f65a63d325..dc903790d0 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 @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) d @@ -44,6 +45,6 @@ public class RequestGetBossRecord implements IClientIncomingPacket return; } - LOGGER.warning("Player " + player + " (boss ID: " + _bossId + ") used unsuded packet " + RequestGetBossRecord.class.getSimpleName()); + PacketLogger.warning("Player " + 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 d0add3fa49..04abcbce46 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 @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaEquipList; @@ -67,7 +68,7 @@ public class RequestHennaEquip implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.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 fa21b68043..a7c019d65d 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; @@ -52,7 +53,7 @@ public class RequestHennaItemInfo implements IClientIncomingPacket { if (_symbolId != 0) { - LOGGER.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning(getClass().getSimpleName() + ": Invalid Henna Id: " + _symbolId + " from player " + player); } client.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 b943775334..ff96a400c9 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 @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; @@ -50,10 +51,11 @@ public class RequestHennaItemRemoveInfo implements IClientIncomingPacket final Henna henna = HennaData.getInstance().getHenna(_symbolId); if (henna == null) { - LOGGER.warning("Invalid Henna Id: " + _symbolId + " from player " + player); + PacketLogger.warning("Invalid Henna Id: " + _symbolId + " from player " + player); client.sendPacket(ActionFailed.STATIC_PACKET); return; } + player.sendPacket(new HennaItemRemoveInfo(henna, player)); } } 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 ab9f0c33f7..89e11ba6a9 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -75,7 +76,7 @@ public class RequestHennaRemove implements IClientIncomingPacket // TODO: Test. if (!found) { - LOGGER.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); + PacketLogger.warning(getClass().getSimpleName() + ": Player " + player + " requested Henna Draw remove without any henna."); client.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 53f04488a6..ada67e190c 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; @@ -49,20 +50,20 @@ public class RequestLinkHtml implements IClientIncomingPacket if (_link.isEmpty()) { - LOGGER.warning("Player " + actor.getName() + " sent empty html link!"); + PacketLogger.warning("Player " + actor.getName() + " sent empty html link!"); return; } if (_link.contains("..")) { - LOGGER.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent invalid html link: link " + _link); return; } final int htmlObjectId = actor.validateHtmlAction("link " + _link); if (htmlObjectId == -1) { - LOGGER.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); + PacketLogger.warning("Player " + actor.getName() + " sent non cached html link: link " + _link); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java index 89adeae67b..2e1c1c83f6 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author UnAfraid @@ -51,7 +52,7 @@ public class RequestMagicSkillList implements IClientIncomingPacket if (player.getObjectId() != _objectId) { - LOGGER.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); + PacketLogger.warning("Player: " + player + " requested " + getClass().getSimpleName() + " with different object id: " + _objectId); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 9432941937..a228079092 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -64,7 +64,7 @@ public class RequestMagicSkillUse implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); // if (_magicId > 0) // { - // LOGGER.warning("Skill Id " + _magicId + " not found in player: " + player); + // PacketLogger.warning("Skill Id " + _magicId + " not found in player: " + player); // } return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 8566204a33..e5beb36b37 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPledgeCount; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListDelete; @@ -71,7 +72,7 @@ public class RequestOustPledgeMember implements IClientIncomingPacket final ClanMember member = clan.getClanMember(_target); if (member == null) { - LOGGER.warning("Target (" + _target + ") is not member of the clan"); + PacketLogger.warning("Target (" + _target + ") is not member of the clan"); return; } if (member.isOnline() && member.getPlayer().isInCombat()) diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java index 9702554c3b..209835b319 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Format: (ch) S @@ -37,6 +38,6 @@ public class RequestPCCafeCouponUse implements IClientIncomingPacket @Override public void run(GameClient client) { - LOGGER.info("C5: RequestPCCafeCouponUse: S: " + _str); + PacketLogger.info("C5: RequestPCCafeCouponUse: S: " + _str); } } 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 4d3adf25dc..e8de8fee2a 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 @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -113,7 +114,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item item = player.checkItemManipulation(i.getId(), i.getCount(), "freight"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); warehouse.deleteMe(); return; } @@ -162,7 +163,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); warehouse.deleteMe(); return; } @@ -170,7 +171,7 @@ public class RequestPackageSend implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem("Trade", i.getId(), i.getCount(), warehouse, player, null); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index 8ece2b3ec7..fec0dc36a0 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -25,6 +25,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Plim @@ -74,7 +75,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket } catch (SQLException e) { - LOGGER.severe("Error while saving petition feedback"); + PacketLogger.warning("Error while saving petition feedback."); } } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java index d212481717..3459b04c80 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java @@ -44,8 +44,8 @@ public class RequestPledgeMemberInfo implements IClientIncomingPacket @Override public void run(GameClient client) { - // LOGGER.info("C5: RequestPledgeMemberInfo d:"+_unk1); - // LOGGER.info("C5: RequestPledgeMemberInfo S:"+_player); + // PacketLogger.info("C5: RequestPledgeMemberInfo d:"+_unk1); + // PacketLogger.info("C5: RequestPledgeMemberInfo S:"+_player); final Player player = client.getPlayer(); if (player == null) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index e56c105cf4..44bbd9d34c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.HashMap; import java.util.Map; -import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; @@ -38,6 +37,7 @@ import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; @@ -74,7 +74,7 @@ public class RequestPreviewItem implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.SEVERE, "", e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } @@ -152,7 +152,7 @@ public class RequestPreviewItem implements IClientIncomingPacket final Merchant merchant = (target instanceof Merchant) ? (Merchant) target : null; if (merchant == null) { - LOGGER.warning("Null merchant!"); + PacketLogger.warning(getClass().getSimpleName() + ": Null merchant!"); 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 251757c0ba..94958bc4fe 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 @@ -31,6 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.util.Util; @@ -145,7 +146,7 @@ public class RequestPrivateStoreBuy implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); if (result > 1) { - LOGGER.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore buy has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); } return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java index 9998465898..8ab3d4962f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java @@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; public class RequestPrivateStoreSell implements IClientIncomingPacket @@ -134,7 +135,7 @@ public class RequestPrivateStoreSell implements IClientIncomingPacket if (!storeList.privateStoreSell(player, _items)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); + PacketLogger.warning("PrivateStore sell has failed due to invalid list or request. Player: " + player.getName() + ", Private store of: " + storePlayer.getName()); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index a4010ca2cb..1632df189f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; @@ -193,7 +194,7 @@ public class RequestRefundItem implements IClientIncomingPacket final Item item = player.getRefund().transferItem("Refund", objectIds[i], Long.MAX_VALUE, player.getInventory(), player, player.getLastFolkNPC()); if (item == null) { - LOGGER.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error refunding object for char " + player.getName() + " (newitem == null)"); } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java index ee78579ea4..8a2f42272a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket { @@ -54,7 +55,7 @@ public class RequestReplySurrenderPledgeWar implements IClientIncomingPacket } else { - LOGGER.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); + PacketLogger.info(getClass().getSimpleName() + ": Missing implementation for answer: " + _answer + " and name: " + _reqName + "!"); } player.onTransactionRequest(requestor); } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index afc4e65df4..08ad2c7763 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -38,6 +38,7 @@ import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.Fort.FortFunction; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @version $Revision: 1.7.2.3.2.6 $ $Date: 2005/03/27 15:29:30 $ @@ -139,7 +140,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if ((player.getClan() == null) || (player.getClan().getHideoutId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.CLANHALL); @@ -167,7 +168,7 @@ public class RequestRestartPoint implements IClientIncomingPacket } else { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Castle and he doesn't have Castle!"); return; } } @@ -199,7 +200,7 @@ public class RequestRestartPoint implements IClientIncomingPacket final Clan clan = player.getClan(); if ((clan == null) || (clan.getFortId() == 0)) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Fortress and he doesn't have Fortress!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.FORTRESS); @@ -231,7 +232,7 @@ public class RequestRestartPoint implements IClientIncomingPacket if (((siegeClan == null) || siegeClan.getFlag().isEmpty())) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!"); return; } loc = MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.SIEGEFLAG); @@ -241,7 +242,7 @@ public class RequestRestartPoint implements IClientIncomingPacket { if (!player.isGM() && !player.getInventory().haveItemForSelfResurrection()) { - LOGGER.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); + PacketLogger.warning("Player [" + player.getName() + "] called RestartPointPacket - Fixed and he isn't festival participant!"); return; } if (player.isGM() || player.destroyItemByItemId("Feather", 10649, 1, player, false) || player.destroyItemByItemId("Feather", 13300, 1, player, false) || player.destroyItemByItemId("Feather", 13128, 1, player, false)) diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index cd8e900014..3582b308eb 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExNoticePostSent; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -316,14 +317,14 @@ public class RequestSendPost implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(i.getObjectId(), i.getCount(), "attach"); if ((oldItem == null) || !oldItem.isTradeable() || oldItem.isEquipped()) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (olditem == null)"); return false; } final Item newItem = player.getInventory().transferItem("SendMail", i.getObjectId(), i.getCount(), attachments, player, msg.getReceiverName() + "[" + msg.getReceiverId() + "]"); if (newItem == null) { - LOGGER.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error adding attachment for char " + player.getName() + " (newitem == null)"); continue; } newItem.setItemLocation(newItem.getItemLocation(), msg.getId()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java index 2a33016c9a..b5d130046c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SiegeInfo; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -54,16 +55,16 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket final Castle castle = CastleManager.getInstance().getCastleById(_castleId); if ((player == null) || (castle == null)) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId); return; } if ((castle.getOwnerId() > 0) && (castle.getOwnerId() != player.getClanId())) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date of not his own castle!"); } else if (!player.isClanLeader()) { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but is not clan leader!"); } else if (!castle.isTimeRegistrationOver()) { @@ -79,12 +80,12 @@ public class RequestSetCastleSiegeTime implements IClientIncomingPacket } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to an invalid time (" + new Date(_time) + " !"); } } else { - LOGGER.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); + PacketLogger.warning(getClass().getSimpleName() + ": activeChar: " + player + " castle: " + castle + " castleId: " + _castleId + " is trying to change siege date but currently not possible!"); } } 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 88a9e1c787..f17566d545 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 @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.LeaveWorld; @@ -112,7 +113,7 @@ public class Say2 implements IClientIncomingPacket ChatType chatType = ChatType.findByClientId(_type); if (chatType == null) { - LOGGER.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); + PacketLogger.warning("Say2: Invalid type: " + _type + " Player : " + player.getName() + " text: " + _text); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -120,7 +121,7 @@ public class Say2 implements IClientIncomingPacket if (_text.isEmpty()) { - LOGGER.warning(player.getName() + ": sending empty text. Possible packet hack!"); + PacketLogger.warning(player.getName() + ": sending empty text. Possible packet hack!"); player.sendPacket(ActionFailed.STATIC_PACKET); Disconnection.of(player).defaultSequence(LeaveWorld.STATIC_PACKET); return; @@ -214,7 +215,7 @@ public class Say2 implements IClientIncomingPacket } else { - LOGGER.info("No handler registered for ChatType: " + _type + " Player: " + client); + PacketLogger.info("No handler registered for ChatType: " + _type + " Player: " + client); } } @@ -260,7 +261,7 @@ public class Say2 implements IClientIncomingPacket final Item item = owner.getInventory().getItemByObjectId(id); if (item == null) { - LOGGER.info(client + " trying publish item which doesnt own! ID:" + id); + PacketLogger.info(client + " trying publish item which doesnt own! ID:" + id); return false; } item.publish(); @@ -268,7 +269,7 @@ public class Say2 implements IClientIncomingPacket pos1 = _text.indexOf(8, pos) + 1; if (pos1 == 0) // missing ending tag { - LOGGER.info(client + " sent invalid publish item msg! ID:" + id); + PacketLogger.info(client + " sent invalid publish item msg! ID:" + id); return false; } } 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 f89be1cfcb..84b879e0f7 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 @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.Util; @@ -127,7 +128,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item item = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (item == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)"); return; } @@ -174,7 +175,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item oldItem = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit"); if (oldItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } @@ -186,7 +187,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket final Item newItem = player.getInventory().transferItem(warehouse.getName(), itemHolder.getId(), itemHolder.getCount(), warehouse, player, manager); if (newItem == null) { - LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)"); continue; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index cff7284f2f..7224f6c56b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; @@ -156,14 +157,14 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket final Item oldItem = warehouse.getItemByObjectId(i.getId()); if ((oldItem == null) || (oldItem.getCount() < i.getCount())) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (olditem == null)"); return; } final Item newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, player.getLastFolkNPC()); if (newItem == null) { - LOGGER.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); + PacketLogger.warning("Error withdrawing a warehouse object for char " + player.getName() + " (newitem == null)"); return; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index d3b33be1bb..4b9b76d898 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -46,6 +46,7 @@ import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExShowVariationMakeWindow; @@ -292,7 +293,7 @@ public class UseItem implements IClientIncomingPacket { if ((etcItem != null) && (etcItem.getHandlerName() != null)) { - LOGGER.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); + PacketLogger.warning("Unmanaged Item handler: " + etcItem.getHandlerName() + " for Item Id: " + _itemId + "!"); } } else if (handler.useItem(player, item, _ctrlPressed)) diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java index 615bf22813..2741ea8ca5 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java @@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.model.ElementalSpirit; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.PlaySound; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; @@ -66,7 +67,7 @@ public class ExRequestClassChange implements IClientIncomingPacket } if (!canChange) { - LOGGER.warning(player + " tried to change class from " + player.getClassId() + " to " + ClassId.getClassId(_classId) + "!"); + PacketLogger.warning(player + " tried to change class from " + player.getClassId() + " to " + ClassId.getClassId(_classId) + "!"); 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 20d84a2bd6..6b2f96e87d 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 @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; @@ -60,37 +61,35 @@ public class RequestCommissionRegister implements IClientIncomingPacket if ((_feeDiscountType < 0) || (_feeDiscountType > 2)) { - LOGGER.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission discount type: " + _feeDiscountType + "."); return; } if ((_feeDiscountType == 1) && (player.getInventory().getItemByItemId(22351) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 30% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 30% Voucher not found in inventory."); return; } else if ((_feeDiscountType == 2) && (player.getInventory().getItemByItemId(22352) == null)) { - LOGGER.warning("Player " + player + ": Auction House Fee 100% Voucher no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House Fee 100% Voucher not found in inventory."); return; } if ((_durationType < 0) || (_durationType > 5)) { - LOGGER.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); + PacketLogger.warning("Player " + player + " sent incorrect commission duration type: " + _durationType + "."); return; } if ((_durationType == 4) && (player.getInventory().getItemByItemId(22353) == null)) { - - LOGGER.warning("Player " + player + ": Auction House (15-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + player + ": Auction House (15-day) Extension not found in inventory."); return; - } else if ((_durationType == 5) && (player.getInventory().getItemByItemId(22354) == null)) { - LOGGER.warning("Player " + player + ": Auction House (30-day) ExtensiΓ³n no found in her inventory."); + PacketLogger.warning("Player " + 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/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index f9db76f0c4..0100c0113d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; @@ -94,7 +95,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) { client.sendPacket(ActionFailed.STATIC_PACKET); - LOGGER.warning(player + ": tried to crystallize " + item.getItem()); + PacketLogger.warning(player + ": tried to crystallize " + item.getItem()); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java index 999f5b7619..d8a8f85043 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.RewardRequest; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ServerClose; import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward; @@ -62,7 +63,7 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket if (player.hasRequest(RewardRequest.class)) { - LOGGER.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); + PacketLogger.warning("Kicked " + player + " for spamming " + getClass().getSimpleName()); Disconnection.of(player).defaultSequence(ServerClose.STATIC_PACKET); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index f668f20dcb..80f672c54e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets.ensoul; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnsoulData; import org.l2jmobius.gameserver.enums.PrivateStoreType; @@ -28,6 +26,7 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.AbnormalType; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -39,7 +38,6 @@ import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; */ public class RequestItemEnsoul implements IClientIncomingPacket { - private static final Logger LOGGER = Logger.getLogger(RequestItemEnsoul.class.getName()); private int _itemObjectId; private EnsoulItemOption[] _options; @@ -119,37 +117,37 @@ public class RequestItemEnsoul implements IClientIncomingPacket final Item item = player.getInventory().getItemByObjectId(_itemObjectId); if (item == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item without having it!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item without having it!"); return; } if (!item.isEquipable()) { - LOGGER.warning("Player: " + player + " attempting to ensoul non equippable item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul non equippable item: " + item + "!"); return; } if (!item.isWeapon()) { - LOGGER.warning("Player: " + player + " attempting to ensoul item that's not a weapon: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item that's not a weapon: " + item + "!"); return; } if (item.isCommonItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul common item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul common item: " + item + "!"); return; } if (item.isShadowItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul shadow item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul shadow item: " + item + "!"); return; } if (item.isHeroItem()) { - LOGGER.warning("Player: " + player + " attempting to ensoul hero item: " + item + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul hero item: " + item + "!"); return; } if ((_options == null) || (_options.length == 0)) { - LOGGER.warning("Player: " + player + " attempting to ensoul item without any special ability declared!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item without any special ability declared!"); return; } @@ -173,14 +171,14 @@ public class RequestItemEnsoul implements IClientIncomingPacket if (!stone.getOptions().contains(itemOption.getSoulCrystalOption())) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that stone doesn't contains!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that stone doesn't contains!"); continue; } final EnsoulOption option = EnsoulData.getInstance().getOption(itemOption.getSoulCrystalOption()); if (option == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that doesn't exists!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that doesn't exists!"); continue; } @@ -205,13 +203,13 @@ public class RequestItemEnsoul implements IClientIncomingPacket } else { - LOGGER.warning("Player: " + player + " attempting to ensoul item option with unhandled type: " + itemOption.getType() + "!"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option with unhandled type: " + itemOption.getType() + "!"); continue; } if (fee == null) { - LOGGER.warning("Player: " + player + " attempting to ensoul item option that doesn't exists! (unknown fee)"); + PacketLogger.warning("Player: " + player + " attempting to ensoul item option that doesn't exists! (unknown fee)"); continue; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java index b12c280c6d..635799d26b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java @@ -18,12 +18,12 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -102,7 +102,7 @@ public class RequestAnswerFriendInvite implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "Could not add friend objectid: " + e.getMessage(), e); + PacketLogger.warning("Could not add friend objectid: " + e.getMessage()); } } else diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java index 2dad174d89..73cd9a6a4b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.friend; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -26,6 +25,7 @@ import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -99,7 +99,7 @@ public class RequestFriendDel implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, "could not del friend objectid: ", e); + PacketLogger.warning("Could not del friend objectid: " + e.getMessage()); } } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index ff8eb57629..e4ad042344 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.mentoring; import java.sql.Connection; import java.sql.PreparedStatement; -import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; @@ -28,6 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMenteeAdd; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -91,7 +91,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket } catch (Exception e) { - LOGGER.log(Level.WARNING, e.getMessage(), e); + PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGetItemFromPet.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGetItemFromPet.java index fee0b270a5..e230a05384 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGetItemFromPet.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGetItemFromPet.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.pet.PetItemList; import org.l2jmobius.gameserver.util.Util; @@ -85,7 +86,7 @@ public class RequestGetItemFromPet implements IClientIncomingPacket } else { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGiveItemToPet.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGiveItemToPet.java index 13512321f5..6f8d5bb3ea 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGiveItemToPet.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGiveItemToPet.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.pet.PetItemList; @@ -125,7 +126,7 @@ public class RequestGiveItemToPet implements IClientIncomingPacket } else { - LOGGER.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); + PacketLogger.warning("Invalid item transfer request: " + pet.getName() + "(pet) --> " + player.getName()); } } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetUseItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetUseItem.java index a3e449b1cc..e0abde33bb 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetUseItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetUseItem.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; @@ -138,7 +139,7 @@ public class RequestPetUseItem implements IClientIncomingPacket else { player.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM); - LOGGER.warning("No item handler registered for itemId: " + item.getId()); + PacketLogger.warning("No item handler registered for itemId: " + item.getId()); } } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java index 2065a0e803..793a3a0387 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.clan.ClanRewardBonus; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -71,7 +72,7 @@ public class RequestPledgeBonusReward implements IClientIncomingPacket } else { - LOGGER.warning(player + " Attempting to claim reward but clan(" + clan + ") doesn't have such!"); + PacketLogger.warning(player + " Attempting to claim reward but clan(" + clan + ") doesn't have such!"); } } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java index ee8910d06e..a53878b794 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductList; @@ -60,7 +61,7 @@ public class RequestBRProductList implements IClientIncomingPacket } default: { - LOGGER.warning(player + " send unhandled product list type: " + _type); + PacketLogger.warning(player + " send unhandled product list type: " + _type); break; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java index 10c89bed0e..f29aabd0cb 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java @@ -51,7 +51,7 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket } else { - // LOGGER.warning("Could not find spawn info for boss " + bossId + "."); + // PacketLogger.warning("Could not find spawn info for boss " + bossId + "."); } } else diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java index 1c6488efd4..21aa8f4169 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.request.SayuneRequest; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.type.SayuneZone; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; @@ -71,7 +72,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (zone.getMapId() == -1) { player.sendMessage("That zone is not supported yet!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on zone with no map id set"); return; } @@ -79,7 +80,7 @@ public class RequestFlyMoveStart implements IClientIncomingPacket if (map == null) { player.sendMessage("This zone is not handled yet!!"); - LOGGER.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); + PacketLogger.warning(getClass().getSimpleName() + ": " + player + " Requested sayune on unhandled map zone " + zone.getName()); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java index f1ede4ef0a..41648f184f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Shuttle; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -60,7 +61,7 @@ public class RequestShuttleGetOn implements IClientIncomingPacket player.getInVehiclePosition().setXYZ(_x, _y, _z); break; } - LOGGER.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); + PacketLogger.info(getClass().getSimpleName() + ": range between char and shuttle: " + shuttle.calculateDistance3D(player)); } } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleport.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleport.java index dcf86e38ee..f86087edee 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleport.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleport.java @@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; @@ -58,7 +59,7 @@ public class ExRequestTeleport implements IClientIncomingPacket final TeleportListHolder teleport = TeleportListData.getInstance().getTeleport(_teleportId); if (teleport == null) { - LOGGER.warning("No registered teleport location for id: " + _teleportId); + PacketLogger.warning("No registered teleport location for id: " + _teleportId); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoritesAddDel.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoritesAddDel.java index a5b01e87b5..50f4b4d87d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoritesAddDel.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExRequestTeleportFavoritesAddDel.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.data.xml.TeleportListData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; /** @@ -53,7 +54,7 @@ public class ExRequestTeleportFavoritesAddDel implements IClientIncomingPacket if (TeleportListData.getInstance().getTeleport(_teleportId) == null) { - LOGGER.warning("No registered teleport location for id: " + _teleportId); + PacketLogger.warning("No registered teleport location for id: " + _teleportId); return; } @@ -62,7 +63,7 @@ public class ExRequestTeleportFavoritesAddDel implements IClientIncomingPacket { if (TeleportListData.getInstance().getTeleport(_teleportId) == null) { - LOGGER.warning("No registered teleport location for id: " + _teleportId); + PacketLogger.warning("No registered teleport location for id: " + _teleportId); } else { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java index 38d06e16ed..03e69980fa 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java @@ -35,6 +35,7 @@ import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skill.CommonSkill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.teleports.ExRaidTeleportInfo; @@ -65,7 +66,7 @@ public class ExTeleportToRaidPosition implements IClientIncomingPacket final TeleportListHolder teleport = RaidTeleportListData.getInstance().getTeleport(_raidId); if (teleport == null) { - LOGGER.warning("No registered teleport location for raid id: " + _raidId); + PacketLogger.warning("No registered teleport location for raid id: " + _raidId); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 33eeff5060..1b8ddb2042 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -16,11 +16,10 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Level; - import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.enums.HtmlActionScope; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.util.Util; /** @@ -75,7 +74,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { if (html.length() > 17200) { - LOGGER.log(Level.WARNING, "Html is too long! this will crash the client!", new Throwable()); + PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } @@ -94,7 +93,7 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket if (content == null) { setHtml("My Text is missing:
" + path + ""); - LOGGER.warning("missing html page " + path); + PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index e6b4b8b604..57ed88ac29 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; /** @@ -46,7 +47,7 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index d94dbf4403..75f6596194 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author Migi, DS @@ -44,7 +45,7 @@ public class ExReplySentPost extends AbstractItemPacket } else { - LOGGER.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); + PacketLogger.warning("Message " + msg.getId() + " has attachments but itemcontainer is empty."); } } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index b0f3738683..15d011befc 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author KenM @@ -54,7 +55,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); + PacketLogger.warning("Castle owner with no name! Castle: " + castle.getName() + " has an OwnerId = " + castle.getOwnerId() + " who does not have a name!"); packet.writeS(""); } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index d588f1c7cf..b5c8628b50 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -16,8 +16,6 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.logging.Logger; - import org.l2jmobius.commons.network.IOutgoingPacket; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; @@ -28,8 +26,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory; */ public interface IClientOutgoingPacket extends IOutgoingPacket { - Logger LOGGER = Logger.getLogger(IClientOutgoingPacket.class.getName()); - int[] PAPERDOLL_ORDER = new int[] { Inventory.PAPERDOLL_UNDER, diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 058e1d34b0..818c38a076 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -20,6 +20,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.Clan.SubPledge; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * @author -Wooden- @@ -56,7 +57,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket } else if (_clan.getClanMember(LeaderId) == null) { - LOGGER.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); + PacketLogger.warning("SubPledgeLeader: " + LeaderId + " is missing from clan: " + _clan.getName() + "[" + _clan.getId() + "]"); return ""; } else diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index 2d436d0a58..59ec218c84 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -21,6 +21,7 @@ import org.l2jmobius.gameserver.data.xml.RecipeData; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class RecipeItemMakeInfo implements IClientOutgoingPacket { @@ -58,7 +59,8 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeQ(0x00); return true; } - LOGGER.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); + + PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 432ff8ad7f..0a3fe46cb7 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; /** * Shows the Siege Info
@@ -78,7 +79,7 @@ public class SiegeInfo implements IClientOutgoingPacket } else { - LOGGER.warning("Null owner for castle: " + _castle.getName()); + PacketLogger.warning("Null owner for castle: " + _castle.getName()); } } else diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 4ed2ccc9b6..55902e07e1 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; @@ -158,7 +159,7 @@ public class SystemMessage implements IClientOutgoingPacket // Mobius: With additional on-screen damage param (popup), length is increased. if (param.getType() != TYPE_POPUP_ID) { - LOGGER.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); + PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } @@ -421,7 +422,7 @@ public class SystemMessage implements IClientOutgoingPacket { if (param == null) { - LOGGER.warning("Found null parameter for SystemMessageId " + _smId); + PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 37150ec357..7af1cd273c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -24,6 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; public class WareHouseWithdrawalList extends AbstractItemPacket { @@ -56,7 +57,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket _invSize = player.getInventory().getSize(); if (_player.getActiveWarehouse() == null) { - LOGGER.warning("error while sending withdraw request to: " + _player.getName()); + PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java index a63178770a..d1896f32a7 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java @@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.instancemanager.RankManager; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; /** @@ -134,7 +135,7 @@ public class ExOlympiadHeroAndLegendInfo implements IClientOutgoingPacket } catch (SQLException e) { - LOGGER.warning("Hero and Legend Info: Couldnt load data: " + e.getMessage()); + PacketLogger.warning("Hero and Legend Info: Couldnt load data: " + e.getMessage()); } } return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java index 710d957175..b7395dee4e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.OutgoingPackets; +import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; /** @@ -96,7 +97,7 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket } catch (SQLException e) { - LOGGER.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); + PacketLogger.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); } int previousPlace = 0; @@ -125,7 +126,7 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket } catch (SQLException e) { - LOGGER.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); + PacketLogger.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); } int heroCount = 0;